• Nate Fischer's avatar
    Revert "[AW][Dev-UI] always include icon resource" · 32274831
    Nate Fischer authored
    This reverts commit 6d24e357.
    
    Reason for revert: launcher icons cause problems for work profile (crbug/1148909)
    
    Original change's description:
    > [AW][Dev-UI] always include icon resource
    >
    > Standalone & Trichrome WebView now unconditionally includes
    > LauncherActivity (defined in DeveloperUiLauncherManifest), and
    > conditionally set the enabled state to true/false based on GN args
    > (webview_devui_show_icon, which is configured by android_channel).
    >
    > This is a step toward resolving https://crbug.com/1047824, although this
    > is not a complete solution since this doesn't change the monochrome
    > behavior.
    >
    > Fixed: 1140741
    > Bug: 1047824
    > Test: aapt dump xmltree TrichromeWebViewGoogle.apk AndroidManifest.xml | grep -A 2 'LauncherActivity'
    > Test: Same for TrichromeWebViewGoogleBeta, TrichromeWebViewGoogleStable, SystemWebViewGoogle, SystemWebView
    > Test: adb shell pm enable com.google.android.webview.debug/org.chromium.android_webview.devui.LauncherActivity
    > Test: adb shell pm disable com.google.android.webview.debug/org.chromium.android_webview.devui.LauncherActivity
    > Change-Id: Id996965643a6fea31a34ebe39fb5b2b8ac5f5c0a
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500435
    > Reviewed-by: Hazem Ashmawy <hazems@chromium.org>
    > Reviewed-by: Richard Coles <torne@chromium.org>
    > Commit-Queue: Richard Coles <torne@chromium.org>
    > Auto-Submit: Nate Fischer <ntfschr@chromium.org>
    > Cr-Commit-Position: refs/heads/master@{#822231}
    
    TBR=torne@chromium.org,ntfschr@chromium.org,hazems@chromium.org
    
    # Not skipping CQ checks because original CL landed > 1 day ago.
    
    Bug: 1047824
    Bug: 1148909
    Bug: b/173091361
    Change-Id: Ibf176cb5daaaf27063d9f5bacc5cfb86eb49f5bc
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2538153
    Auto-Submit: Nate Fischer <ntfschr@chromium.org>
    Reviewed-by: default avatarRichard Coles <torne@chromium.org>
    Commit-Queue: Richard Coles <torne@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#827414}
    32274831
system_webview_bundle.AndroidManifest.expected 21.8 KB