Update to 63.0.3239.30

Author: kuoruan

app/src/main/assets/en-US.pak

@@ -26,7 +26,7 @@ public class ResourceExtractor {
     private static final String TAG = "base";
     private static final String ICU_DATA_FILENAME = "icudtl.dat";
     private static final String V8_NATIVES_DATA_FILENAME = "natives_blob.bin";
-    private static final String V8_SNAPSHOT_DATA_FILENAME = "snapshot_blob.bin";
+    private static final String V8_SNAPSHOT_DATA_FILENAME = "snapshot_blob_32.bin";
     private static final String FALLBACK_LOCALE = "en-US";
 
     private class ExtractTask extends AsyncTask<Void, Void, Void> {

app/src/main/assets/resources.pak

@@ -8,5 +8,5 @@ public class NativeLibraries {
     public static final String[] LIBRARIES =
       {"chrome"};
     static String sVersionNumber =
-      "63.0.3239.18";
+      "63.0.3239.30";
 }

app/src/main/assets/zh-CN.pak

@@ -64,8 +64,8 @@ public Bitmap getBitmap(String pageUrl, Bitmap largestFavicon) {
         }
 
         if (mGenerator == null) {
-            mGenerator = new RoundedIconGenerator(mContext, APP_ICON_SIZE_DP, APP_ICON_SIZE_DP,
-                    APP_ICON_CORNER_RADIUS_DP, APP_ICON_DEFAULT_BACKGROUND_COLOR,
+            mGenerator = new RoundedIconGenerator(mContext.getResources(), APP_ICON_SIZE_DP,
+                    APP_ICON_SIZE_DP, APP_ICON_CORNER_RADIUS_DP, APP_ICON_DEFAULT_BACKGROUND_COLOR,
                     APP_ICON_TEXT_SIZE_DP);
         }
 

app/src/main/assets/zh-TW.pak

@@ -81,13 +81,6 @@ public abstract class ChromeSwitches {
      */
     public static final String DISABLE_TAB_MERGING_FOR_TESTING = "disable-tab-merging";
 
-    /**
-     * Force-enable partner customization for testing.
-     * Partner customization includes configurations from PartnerBookmarksProvider and
-     * PartnerBrowserCustomizations.
-     */
-    public static final String ALLOW_PARTNER_CUSTOMIZATION = "allow-partner-customization";
-
     ///////////////////////////////////////////////////////////////////////////////////////////////
     // Native Switches
     ///////////////////////////////////////////////////////////////////////////////////////////////

app/src/main/java/org/chromium/base/ResourceExtractor.java

@@ -6,7 +6,7 @@
 
 class ChromeVersionConstants {
     static final String PRODUCT_NAME = "Chromium";
-    static final String PRODUCT_VERSION = "63.0.3239.18";
+    static final String PRODUCT_VERSION = "63.0.3239.30";
     static final boolean IS_OFFICIAL_BUILD = 1 == 1;
 
     static final int PRODUCT_MAJOR_VERSION = 63;

app/src/main/java/org/chromium/base/library_loader/NativeLibraries.java

@@ -52,6 +52,10 @@ public BookmarkActionBar(Context context, AttributeSet attrs) {
                 .setTitle(R.string.bookmark_action_bar_move);
         getMenu().findItem(R.id.selection_mode_delete_menu_id)
                 .setTitle(R.string.bookmark_action_bar_delete);
+
+        // Wait to enable the selection mode group until the BookmarkDelegate is set. The
+        // SelectionDelegate is retrieved from the BookmarkDelegate.
+        getMenu().setGroupEnabled(R.id.selection_mode_menu_group, false);
     }
 
     @Override
@@ -68,7 +72,6 @@ public void onNavigationBack() {
     public boolean onMenuItemClick(MenuItem menuItem) {
         hideOverflowMenu();
 
-        SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
         if (menuItem.getItemId() == R.id.edit_menu_id) {
             BookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
                     mCurrentFolder.getId());
@@ -79,7 +82,10 @@ public boolean onMenuItemClick(MenuItem menuItem) {
         } else if (menuItem.getItemId() == R.id.search_menu_id) {
             mDelegate.openSearchUI();
             return true;
-        } else if (menuItem.getItemId() == R.id.selection_mode_edit_menu_id) {
+        }
+
+        SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
+        if (menuItem.getItemId() == R.id.selection_mode_edit_menu_id) {
             List<BookmarkId> list = selectionDelegate.getSelectedItems();
             assert list.size() == 1;
             BookmarkItem item = mDelegate.getModel().getBookmarkById(list.get(0));
@@ -131,10 +137,14 @@ public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {
         mDelegate.addUIObserver(this);
         if (!delegate.isDialogUi()) getMenu().removeItem(R.id.close_menu_id);
         delegate.getModel().addObserver(mBookmarkModelObserver);
+
+        getMenu().setGroupEnabled(R.id.selection_mode_menu_group, true);
     }
 
     @Override
     public void onDestroy() {
+        if (mDelegate == null) return;
+
         mDelegate.removeUIObserver(this);
         mDelegate.getModel().removeObserver(mBookmarkModelObserver);
     }

app/src/main/java/org/chromium/chrome/browser/ActivityTaskDescriptionIconGenerator.java

@@ -5,8 +5,10 @@
 package org.chromium.chrome.browser.bookmarks;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.util.AttributeSet;
 
+import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.components.bookmarks.BookmarkId;
@@ -47,4 +49,10 @@ BookmarkItem setBookmarkId(BookmarkId bookmarkId) {
                         : getResources().getString(R.string.no_bookmarks));
         return item;
     }
+
+    @Override
+    protected ColorStateList getDefaultIconTint() {
+        return ApiCompatibilityUtils.getColorStateList(
+                getResources(), BookmarkUtils.getFolderIconTint());
+    }
 }

app/src/main/java/org/chromium/chrome/browser/ChromeSwitches.java

@@ -271,7 +271,14 @@ public static boolean openBookmark(BookmarkModel model, Activity activity,
     public static TintedDrawable getFolderIcon(Resources res) {
         // TODO(twellington): Update tinting to 65% black to match mocks.
         return TintedDrawable.constructTintedDrawable(
-                res, R.drawable.ic_folder_blue_24dp, R.color.dark_mode_tint);
+                res, R.drawable.ic_folder_blue_24dp, getFolderIconTint());
+    }
+
+    /**
+     * @return The tint used on the bookmark folder icon.
+     */
+    public static int getFolderIconTint() {
+        return R.color.dark_mode_tint;
     }
 
     private static void openUrl(Activity activity, String url, ComponentName componentName) {

app/src/main/java/org/chromium/chrome/browser/ChromeVersionConstants.java

@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.compositor.bottombar;
 
 import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 
 import org.chromium.base.VisibleForTesting;
@@ -16,6 +15,7 @@
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
 import org.chromium.chrome.browser.util.MathUtils;
+import org.chromium.chrome.browser.widget.animation.CancelAwareAnimatorListener;
 
 /**
  * Base abstract class for animating the Overlay Panel.
@@ -353,9 +353,9 @@ public void onAnimationUpdate(CompositorAnimator animator) {
                 setPanelHeight(animator.getAnimatedValue());
             }
         });
-        mHeightAnimator.addListener(new AnimatorListenerAdapter() {
+        mHeightAnimator.addListener(new CancelAwareAnimatorListener() {
             @Override
-            public void onAnimationEnd(Animator animation) {
+            public void onEnd(Animator animation) {
                 onHeightAnimationFinished();
             }
         });

app/src/main/java/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java

@@ -291,7 +291,7 @@ private void resolveIntent() {
 
                 Resources res = mContext.getResources();
                 if (mToolbarBackgroundColor != 0
-                        && ColorUtils.isUsingDefaultToolbarColor(res,
+                        && !ColorUtils.isUsingDefaultToolbarColor(res,
                                    FeatureUtilities.isChromeHomeEnabled(), false,
                                    mToolbarBackgroundColor)
                         && ColorUtils.shouldUseLightForegroundOnBackground(

app/src/main/java/org/chromium/chrome/browser/bookmarks/BookmarkFolderRow.java

@@ -194,6 +194,7 @@ public void finishNativeInitialization() {
     @VisibleForTesting
     void propagateInteraction(Intent intent) {
         String action = intent.getAction();
+        DownloadNotificationUmaHelper.recordNotificationInteractionHistogram(action);
         final ContentId id = getContentIdFromIntent(intent);
 
         // Handle actions that do not require a specific entry or service delegate.
@@ -217,7 +218,6 @@ void propagateInteraction(Intent intent) {
 
         Preconditions.checkNotNull(downloadServiceDelegate);
         Preconditions.checkNotNull(id);
-        Preconditions.checkNotNull(entry);
 
         // Handle all remaining actions.
         switch (action) {
@@ -230,8 +230,14 @@ void propagateInteraction(Intent intent) {
                 break;
 
             case ACTION_DOWNLOAD_RESUME:
-                downloadServiceDelegate.resumeDownload(
-                        id, entry.buildDownloadItem(), true /* hasUserGesture */);
+                DownloadItem item = (entry != null)
+                        ? entry.buildDownloadItem()
+                        : new DownloadItem(false,
+                                  new DownloadInfo.Builder()
+                                          .setDownloadGuid(id.id)
+                                          .setIsOffTheRecord(isOffTheRecord)
+                                          .build());
+                downloadServiceDelegate.resumeDownload(id, item, true /* hasUserGesture */);
                 break;
 
             default:

app/src/main/java/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java

@@ -4,15 +4,9 @@
 
 package org.chromium.chrome.browser.download;
 
-import android.app.DownloadManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
-
-import org.chromium.chrome.browser.notifications.NotificationConstants;
-import org.chromium.chrome.browser.util.IntentUtils;
-import org.chromium.components.offline_items_collection.ContentId;
 
 /**
  * This {@link BroadcastReceiver} handles clicks to download notifications and their action buttons.
@@ -24,58 +18,7 @@
 public class DownloadBroadcastReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(final Context context, Intent intent) {
-        String action = intent.getAction();
-        switch (action) {
-            case DownloadManager.ACTION_NOTIFICATION_CLICKED:
-                openDownload(context, intent);
-                break;
-            case DownloadNotificationService.ACTION_DOWNLOAD_RESUME:
-            case DownloadNotificationService.ACTION_DOWNLOAD_CANCEL:
-            case DownloadNotificationService.ACTION_DOWNLOAD_PAUSE:
-            case DownloadNotificationService.ACTION_DOWNLOAD_OPEN:
-            case DownloadNotificationService.ACTION_DOWNLOAD_UPDATE_SUMMARY_ICON:
-                performDownloadOperation(context, intent);
-                break;
-            default:
-                break;
-        }
-    }
-
-    /**
-     * Called to open a particular download item.  Falls back to opening Download Home.
-     * @param context Context of the receiver.
-     * @param intent Intent from the android DownloadManager.
-     */
-    private void openDownload(final Context context, Intent intent) {
-        int notificationId = IntentUtils.safeGetIntExtra(
-                intent, NotificationConstants.EXTRA_NOTIFICATION_ID, -1);
-        DownloadNotificationService.hideDanglingSummaryNotification(context, notificationId);
-
-        long ids[] =
-                intent.getLongArrayExtra(DownloadManager.EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS);
-        if (ids == null || ids.length == 0) {
-            DownloadManagerService.openDownloadsPage(context);
-            return;
-        }
-
-        long id = ids[0];
-        Uri uri = DownloadManagerDelegate.getContentUriFromDownloadManager(context, id);
-        if (uri == null) {
-            DownloadManagerService.openDownloadsPage(context);
-            return;
-        }
-
-        String downloadFilename = IntentUtils.safeGetStringExtra(
-                intent, DownloadNotificationService.EXTRA_DOWNLOAD_FILE_PATH);
-        boolean isSupportedMimeType = IntentUtils.safeGetBooleanExtra(
-                intent, DownloadNotificationService.EXTRA_IS_SUPPORTED_MIME_TYPE, false);
-        boolean isOffTheRecord = IntentUtils.safeGetBooleanExtra(
-                intent, DownloadNotificationService.EXTRA_IS_OFF_THE_RECORD, false);
-        String originalUrl = IntentUtils.safeGetStringExtra(intent, Intent.EXTRA_ORIGINATING_URI);
-        String referrer = IntentUtils.safeGetStringExtra(intent, Intent.EXTRA_REFERRER);
-        ContentId contentId = DownloadNotificationService.getContentIdFromIntent(intent);
-        DownloadManagerService.openDownloadedContent(context, downloadFilename, isSupportedMimeType,
-                isOffTheRecord, contentId.id, id, originalUrl, referrer);
+        performDownloadOperation(context, intent);
     }
 
     /**

app/src/main/java/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelAnimation.java

@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.download;
 
+import static org.chromium.chrome.browser.download.DownloadSnackbarController.INVALID_NOTIFICATION_ID;
+
 import android.app.Notification;
 import android.app.Service;
 import android.content.Context;
@@ -20,6 +22,8 @@
  */
 public class DownloadForegroundService extends Service {
     private final IBinder mBinder = new LocalBinder();
+    // Only tracking for UMA purposes.
+    private int mPinnedNotification = INVALID_NOTIFICATION_ID;
 
     /**
      * Start the foreground service with this given context.
@@ -41,12 +45,31 @@ public void startOrUpdateForegroundService(int notificationId, Notification noti
         }
 
         startForeground(notificationId, notification);
+
+        // Record when starting foreground and when updating pinned notification.
+        if (mPinnedNotification == INVALID_NOTIFICATION_ID) {
+            DownloadNotificationUmaHelper.recordForegroundServiceLifecycleHistogram(
+                    DownloadNotificationUmaHelper.ForegroundLifecycle.START);
+        } else {
+            if (mPinnedNotification != notificationId) {
+                DownloadNotificationUmaHelper.recordForegroundServiceLifecycleHistogram(
+                        DownloadNotificationUmaHelper.ForegroundLifecycle.UPDATE);
+            }
+        }
+        mPinnedNotification = notificationId;
     }
 
     /**
      * Stop the foreground service that is running.
      */
     public void stopDownloadForegroundService(boolean isCancelled) {
+        // Record when stopping foreground.
+        DownloadNotificationUmaHelper.recordForegroundServiceLifecycleHistogram(
+                DownloadNotificationUmaHelper.ForegroundLifecycle.STOP);
+        DownloadNotificationUmaHelper.recordServiceStoppedHistogram(
+                DownloadNotificationUmaHelper.ServiceStopped.STOPPED, true /* withForeground */);
+        mPinnedNotification = INVALID_NOTIFICATION_ID;
+
         // If it's not cancelled, just detach the notification from the service, if possible.
         if (!isCancelled && Build.VERSION.SDK_INT >= 24) {
             stopForeground(STOP_FOREGROUND_DETACH);
@@ -61,6 +84,9 @@ public void stopDownloadForegroundService(boolean isCancelled) {
     public int onStartCommand(Intent intent, int flags, int startId) {
         // In the case the service was restarted when the intent is null.
         if (intent == null) {
+            DownloadNotificationUmaHelper.recordServiceStoppedHistogram(
+                    DownloadNotificationUmaHelper.ServiceStopped.START_STICKY, true);
+
             DownloadForegroundServiceObservers.alertObserversServiceRestarted();
 
             // Allow observers to restart service on their own, if needed.
@@ -73,16 +99,27 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
     @Override
     public void onDestroy() {
+        DownloadNotificationUmaHelper.recordServiceStoppedHistogram(
+                DownloadNotificationUmaHelper.ServiceStopped.DESTROYED, true /* withForeground */);
         DownloadForegroundServiceObservers.alertObserversServiceDestroyed();
         super.onDestroy();
     }
 
     @Override
     public void onTaskRemoved(Intent rootIntent) {
+        DownloadNotificationUmaHelper.recordServiceStoppedHistogram(
+                DownloadNotificationUmaHelper.ServiceStopped.TASK_REMOVED, true /*withForeground*/);
         DownloadForegroundServiceObservers.alertObserversTaskRemoved();
         super.onTaskRemoved(rootIntent);
     }
 
+    @Override
+    public void onLowMemory() {
+        DownloadNotificationUmaHelper.recordServiceStoppedHistogram(
+                DownloadNotificationUmaHelper.ServiceStopped.LOW_MEMORY, true /* withForeground */);
+        super.onLowMemory();
+    }
+
     @Nullable
     @Override
     public IBinder onBind(Intent intent) {