[WebAPKs] Larger Splash Icon: Remainder of client side changes

This constitutes the remainder of the changes required for the
client to show a larger splash screen icon. The server still needs
a few more changes before the larger icons can be shipped but this
gets the client to a point where the larger icons can be used.

Updates will occur automatically when the new Shell APK version is
pushed. Otherwise apps will continue to use the small icons.
Because larger splash icons are just app icons, all that is needed
to trigger an update is changing the icons in the WebappManifest to
update the splash screen icons.

Tested on mdpi, hdpi, xhdpi, and xxhdpi devices running L, N, O, P.

There is a known issue on P Beta builds where xxhdpi devices don't
use the large layout due to Bitmap#getWidth() and Bitmap#getHeight()
returning incorrect values for aliased resources. However, this is
not something we can solve in Chrome and requires Android changes.
See b/111687946

Bug: 819755
Change-Id: I033dba20b766f875b6fc3d7515f24636aa5b0d4a
Reviewed-on: https://chromium-review.googlesource.com/1142475Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Xi Han <hanxi@chromium.org>
Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577248}

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java

@@ -39,6 +39,7 @@ public class WebApkInfo extends WebappInfo {
     private static final String TAG = "WebApkInfo";
 
     private Icon mBadgeIcon;
+    private Icon mSplashIcon;
     private String mApkPackageName;
     private int mShellApkVersion;
     private String mManifestUrl;
@@ -145,9 +146,12 @@ public class WebApkInfo extends WebappInfo {
         int badgeIconId = IntentUtils.safeGetInt(bundle, WebApkMetaDataKeys.BADGE_ICON_ID, 0);
         Bitmap badgeIcon = decodeBitmapFromDrawable(res, badgeIconId);
 
+        int splashIconId = IntentUtils.safeGetInt(bundle, WebApkMetaDataKeys.SPLASH_ID, 0);
+        Bitmap splashIcon = decodeBitmapFromDrawable(res, splashIconId);
+
         return create(WebApkConstants.WEBAPK_ID_PREFIX + webApkPackageName, url, scope,
-                new Icon(primaryIcon), new Icon(badgeIcon), name, shortName, displayMode,
-                orientation, source, themeColor, backgroundColor, webApkPackageName,
+                new Icon(primaryIcon), new Icon(badgeIcon), new Icon(splashIcon), name, shortName,
+                displayMode, orientation, source, themeColor, backgroundColor, webApkPackageName,
                 shellApkVersion, manifestUrl, manifestStartUrl, iconUrlToMurmur2HashMap,
                 forceNavigation);
     }
@@ -160,6 +164,7 @@ public class WebApkInfo extends WebappInfo {
      * @param scope                   Scope for the WebAPK.
      * @param primaryIcon             Primary icon to show for the WebAPK.
      * @param badgeIcon               Badge icon to use for notifications.
+     * @param splashIcon              Splash icon to use for the splash screen.
      * @param name                    Name of the WebAPK.
      * @param shortName               The short name of the WebAPK.
      * @param displayMode             Display mode of the WebAPK.
@@ -179,9 +184,9 @@ public class WebApkInfo extends WebappInfo {
      *                                WebAPK is already open.
      */
     public static WebApkInfo create(String id, String url, String scope, Icon primaryIcon,
-            Icon badgeIcon, String name, String shortName, @WebDisplayMode int displayMode,
-            int orientation, int source, long themeColor, long backgroundColor,
-            String webApkPackageName, int shellApkVersion, String manifestUrl,
+            Icon badgeIcon, Icon splashIcon, String name, String shortName,
+            @WebDisplayMode int displayMode, int orientation, int source, long themeColor,
+            long backgroundColor, String webApkPackageName, int shellApkVersion, String manifestUrl,
             String manifestStartUrl, Map<String, String> iconUrlToMurmur2HashMap,
             boolean forceNavigation) {
         if (id == null || url == null || manifestStartUrl == null || webApkPackageName == null) {
@@ -198,21 +203,23 @@ public class WebApkInfo extends WebappInfo {
             scope = ShortcutHelper.getScopeFromUrl(manifestStartUrl);
         }
 
-        return new WebApkInfo(id, url, scope, primaryIcon, badgeIcon, name, shortName, displayMode,
-                orientation, source, themeColor, backgroundColor, webApkPackageName,
+        return new WebApkInfo(id, url, scope, primaryIcon, badgeIcon, splashIcon, name, shortName,
+                displayMode, orientation, source, themeColor, backgroundColor, webApkPackageName,
                 shellApkVersion, manifestUrl, manifestStartUrl, iconUrlToMurmur2HashMap,
                 forceNavigation);
     }
 
     protected WebApkInfo(String id, String url, String scope, Icon primaryIcon, Icon badgeIcon,
-            String name, String shortName, @WebDisplayMode int displayMode, int orientation,
-            int source, long themeColor, long backgroundColor, String webApkPackageName,
-            int shellApkVersion, String manifestUrl, String manifestStartUrl,
-            Map<String, String> iconUrlToMurmur2HashMap, boolean forceNavigation) {
+            Icon splashIcon, String name, String shortName, @WebDisplayMode int displayMode,
+            int orientation, int source, long themeColor, long backgroundColor,
+            String webApkPackageName, int shellApkVersion, String manifestUrl,
+            String manifestStartUrl, Map<String, String> iconUrlToMurmur2HashMap,
+            boolean forceNavigation) {
         super(id, url, scope, primaryIcon, name, shortName, displayMode, orientation, source,
                 themeColor, backgroundColor, null /* splash_screen_url */,
                 false /* isIconGenerated */, forceNavigation);
         mBadgeIcon = badgeIcon;
+        mSplashIcon = splashIcon;
         mApkPackageName = webApkPackageName;
         mShellApkVersion = shellApkVersion;
         mManifestUrl = manifestUrl;
@@ -229,6 +236,13 @@ public class WebApkInfo extends WebappInfo {
         return (mBadgeIcon == null) ? null : mBadgeIcon.decoded();
     }
 
+    /**
+     * Returns the splash icon in Bitmap form.
+     */
+    public Bitmap splashIcon() {
+        return (mSplashIcon == null) ? null : mSplashIcon.decoded();
+    }
+
     @Override
     public String apkPackageName() {
         return mApkPackageName;

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcher.java

@@ -112,10 +112,11 @@ public class WebApkUpdateDataFetcher extends EmptyTabObserver {
         }
 
         WebApkInfo info = WebApkInfo.create(mOldInfo.id(), mOldInfo.uri().toString(), scopeUrl,
-                new WebApkInfo.Icon(primaryIconBitmap), new WebApkInfo.Icon(badgeIconBitmap), name,
-                shortName, displayMode, orientation, mOldInfo.source(), themeColor, backgroundColor,
-                mOldInfo.apkPackageName(), mOldInfo.shellApkVersion(), mOldInfo.manifestUrl(),
-                manifestStartUrl, iconUrlToMurmur2HashMap, mOldInfo.shouldForceNavigation());
+                new WebApkInfo.Icon(primaryIconBitmap), new WebApkInfo.Icon(badgeIconBitmap), null,
+                name, shortName, displayMode, orientation, mOldInfo.source(), themeColor,
+                backgroundColor, mOldInfo.apkPackageName(), mOldInfo.shellApkVersion(),
+                mOldInfo.manifestUrl(), manifestStartUrl, iconUrlToMurmur2HashMap,
+                mOldInfo.shouldForceNavigation());
         mObserver.onGotManifestData(info, primaryIconUrl, badgeIconUrl);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappSplashScreenController.java

@@ -96,6 +96,11 @@ class WebappSplashScreenController extends EmptyTabObserver {
                         ? WebappUma.SplashScreenColorStatus.CUSTOM
                         : WebappUma.SplashScreenColorStatus.DEFAULT);
 
+        if (activityType == WebappActivity.ActivityType.WEBAPK) {
+            initializeLayout(webappInfo, backgroundColor, ((WebApkInfo) webappInfo).splashIcon());
+            return;
+        }
+
         WebappDataStorage storage =
                 WebappRegistry.getInstance().getWebappDataStorage(webappInfo.id());
         if (storage == null) {

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcherTest.java

@@ -103,8 +103,8 @@ public class WebApkUpdateDataFetcherTest {
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                WebApkInfo oldInfo = WebApkInfo.create("", "", scopeUrl, null, null, null, null, -1,
-                        -1, -1, -1, -1, "random.package", -1, manifestUrl, "",
+                WebApkInfo oldInfo = WebApkInfo.create("", "", scopeUrl, null, null, null, null,
+                        null, -1, -1, -1, -1, -1, "random.package", -1, manifestUrl, "",
                         new HashMap<String, String>(), false /* forceNavigation */);
                 fetcher.start(mTab, oldInfo, observer);
             }

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerTest.java

@@ -154,7 +154,7 @@ public class WebApkUpdateManagerTest {
             @Override
             public void run() {
                 WebApkInfo info = WebApkInfo.create(WEBAPK_ID, "", creationData.scope, null, null,
-                        creationData.name, creationData.shortName, creationData.displayMode,
+                        null, creationData.name, creationData.shortName, creationData.displayMode,
                         creationData.orientation, 0, creationData.themeColor,
                         creationData.backgroundColor, "", WebApkVersion.CURRENT_SHELL_APK_VERSION,
                         creationData.manifestUrl, creationData.startUrl,

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappVisibilityTest.java

@@ -130,7 +130,7 @@ public class WebappVisibilityTest {
                 ? WebappInfo.create("", webappStartUrlOrScopeUrl, null, null, null, null,
                           displayMode, 0, 0, 0, 0, null, false /* isIconGenerated */,
                           false /* forceNavigation */)
-                : WebApkInfo.create("", "", webappStartUrlOrScopeUrl, null, null, null, null,
+                : WebApkInfo.create("", "", webappStartUrlOrScopeUrl, null, null, null, null, null,
                           displayMode, 0, 0, 0, 0, "", 0, null, "", null,
                           false /* forceNavigation */);
     }

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java

@@ -148,6 +148,7 @@ public class WebApkInfoTest {
 
         Assert.assertEquals(null, info.icon());
         Assert.assertEquals(null, info.badgeIcon());
+        Assert.assertEquals(null, info.splashIcon());
     }
 
     /**

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerUnitTest.java

@@ -253,7 +253,7 @@ public class WebApkUpdateManagerUnitTest {
         final String kPackageName = "org.random.webapk";
         return WebApkInfo.create(getWebApkId(kPackageName), "", manifestData.scopeUrl,
                 new WebApkInfo.Icon(manifestData.primaryIcon),
-                new WebApkInfo.Icon(manifestData.badgeIcon), manifestData.name,
+                new WebApkInfo.Icon(manifestData.badgeIcon), null, manifestData.name,
                 manifestData.shortName, manifestData.displayMode, manifestData.orientation, -1,
                 manifestData.themeColor, manifestData.backgroundColor, kPackageName, -1,
                 WEB_MANIFEST_URL, manifestData.startUrl, manifestData.iconUrlToMurmur2HashMap,

chrome/android/webapk/libs/common/src/org/chromium/webapk/lib/common/WebApkMetaDataKeys.java

@@ -23,6 +23,7 @@ public final class WebApkMetaDataKeys {
     public static final String THEME_COLOR = "org.chromium.webapk.shell_apk.themeColor";
     public static final String BACKGROUND_COLOR = "org.chromium.webapk.shell_apk.backgroundColor";
     public static final String ICON_ID = "org.chromium.webapk.shell_apk.iconId";
+    public static final String SPLASH_ID = "org.chromium.webapk.shell_apk.splashId";
 
     public static final String ICON_URLS_AND_ICON_MURMUR2_HASHES =
             "org.chromium.webapk.shell_apk.iconUrlsAndIconMurmur2Hashes";