Android: Roll material design library 1.0.0-rc02 -> 1.2.0-alpha06

Newer library features are required for //clank code.

Size regression without resource filters:
 * 244,995 bytes, 941 methods
 * https://chromium-review.googlesource.com/c/chromium/src/+/2165449/8

Size regression with just Layouts, Calendar and AlertDialog removed
(AlertDialog is referenced by an unused layout):
 * +134,038 bytes, 344 methods
 * https://chromium-review.googlesource.com/c/chromium/src/+/2197526

"With this particular widget we rolled our own, then unrolled out own
since the savings own since the savings seemed to not quite outweigh
the cost on a subsequent update and we'd be rolling our own again."


Bug: 1064727
Change-Id: Idd02c3540a6e91e54d2fa5dc9a79bd851162bcfb
Binary-Size: Size increase from library. Reduced from 244,955.
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2165449Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Danyao Wang <danyao@chromium.org>
Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774386}

DEPS

@@ -1663,6 +1663,17 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/androidx_annotation_annotation_experimental': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/androidx_annotation_annotation_experimental',
+              'version': 'version:1.0.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
   'src/third_party/android_deps/libs/androidx_appcompat_appcompat': {
       'packages': [
           {
@@ -1755,7 +1766,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_coordinatorlayout_coordinatorlayout',
-              'version': 'version:1.0.0-cr0',
+              'version': 'version:1.1.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2085,7 +2096,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_recyclerview_recyclerview',
-              'version': 'version:1.0.0-cr0',
+              'version': 'version:1.1.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2250,7 +2261,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_transition_transition',
-              'version': 'version:1.0.0-rc02-cr0',
+              'version': 'version:1.2.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2301,6 +2312,17 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/androidx_viewpager2_viewpager2': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/androidx_viewpager2_viewpager2',
+              'version': 'version:1.0.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
   'src/third_party/android_deps/libs/androidx_viewpager_viewpager': {
       'packages': [
           {
@@ -3031,7 +3053,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material',
-              'version': 'version:1.0.0-rc02-cr0',
+              'version': 'version:1.2.0-alpha06-cr0',
           },
       ],
       'condition': 'checkout_android',

chrome/android/chrome_public_apk_tmpl.gni

@@ -178,10 +178,17 @@ template("chrome_public_common_apk_or_module_tmpl") {
     _material_package = "com_google_android_material_material.*"
     resource_exclusion_regex += "|${_material_package}values-small"
 
+    # Used only by date picker (which chrome doesn't use).
+    resource_exclusion_regex += "|${_material_package}-(w480dp-port|w360dp-port|h480dp-land|h360dp-land)"
+
     # Material design layouts that cause views to be kept that we don't use.
     # Instead of manually filtering, unused resource removal would be better:
     # https://crbug.com/636448
     resource_exclusion_regex += "|${_material_package}/layout"
+    resource_exclusion_regex += "|${_material_package}/color.*(choice|chip_|card_|calendar_|bottom_nav_|slider_)"
+    resource_exclusion_regex +=
+        "|${_material_package}/drawable.*design_snackbar"
+    resource_exclusion_regex += "|${_material_package}/xml.*badge_"
     _material_package = "*com_google_android_material_material*"
     resource_exclusion_exceptions += [
       # AppBarLayout
@@ -194,7 +201,28 @@ template("chrome_public_common_apk_or_module_tmpl") {
       "${_material_package}/design_text_*",
       "${_material_package}/text_*",
     ]
-    resource_values_filter_rules = [ "${_material_package}:mtrl_alert" ]
+
+    # Remove unneeded entries from material design values.xml files.
+    resource_values_filter_rules = [
+      "${_material_package}:[Bb]adge",
+      "${_material_package}:[Bb]ottomNavigation",
+      "${_material_package}:[Bb]ottomSheet",
+      "${_material_package}:[Bb]uttonToggleGroup",
+      "${_material_package}:[Cc]alendar",
+      "${_material_package}:[Cc]ardView",
+      "${_material_package}:\b[Cc]hip",
+      "${_material_package}:design_snackbar",
+      "${_material_package}:[Ff]loatingActionButton",
+      "${_material_package}:[Mm]aterialAlertDialog",
+      "${_material_package}:mtrl_alert",
+      "${_material_package}:mtrl_navigation",
+      "${_material_package}:mtrl_slider",
+      "${_material_package}:[Nn]avigationView",
+      "${_material_package}:picker",
+      "${_material_package}:[Ss]nackbar",
+      "${_material_package}:[Ss]lider",
+      "${_material_package}:[Tt]oolbarLayout",
+    ]
 
     if (!_is_monochrome) {
       product_config_java_packages = [ "org.chromium.chrome.browser" ]

chrome/android/java/monochrome_public_bundle.proguard_flags.expected

@@ -596,6 +596,11 @@
     public <init>();
 }
 
+-keepclassmembers class androidx.recyclerview.widget.RecyclerView {
+    public void suppressLayout(boolean);
+    public boolean isLayoutSuppressed();
+}
+
 ################################################################################
 # obj/third_party/android_deps/androidx_savedstate_savedstate_java/proguard.txt
 ################################################################################

components/test/data/payments/render_tests/PaymentRequestRetryTest.retry_with_payer_errors.Nexus_5X-23.png.sha1

-4651790fa40a205088cff59450e163528f98efca
\ No newline at end of file
+93198ea232a420c03cb5b4d4d4752ea973d27fc4

third_party/android_deps/BUILD.gn

@@ -25,6 +25,7 @@ java_group("android_support_v7_appcompat_java") {
   deps = [
     ":android_support_v4_java",
     ":androidx_appcompat_appcompat_java",
+    ":androidx_appcompat_appcompat_resources_java",
     ":androidx_vectordrawable_vectordrawable_animated_java",
     ":androidx_vectordrawable_vectordrawable_java",
   ]
@@ -212,10 +213,11 @@ java_prebuilt("androidx_concurrent_concurrent_futures_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_coordinatorlayout_coordinatorlayout_java") {
-  aar_path = "libs/androidx_coordinatorlayout_coordinatorlayout/coordinatorlayout-1.0.0.aar"
+  aar_path = "libs/androidx_coordinatorlayout_coordinatorlayout/coordinatorlayout-1.1.0.aar"
   info_path = "libs/androidx_coordinatorlayout_coordinatorlayout/androidx_coordinatorlayout_coordinatorlayout.info"
   deps = [
     ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
     ":androidx_core_core_java",
     ":androidx_customview_customview_java",
   ]
@@ -464,12 +466,13 @@ android_aar_prebuilt("androidx_preference_preference_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_recyclerview_recyclerview_java") {
-  aar_path = "libs/androidx_recyclerview_recyclerview/recyclerview-1.0.0.aar"
+  aar_path = "libs/androidx_recyclerview_recyclerview/recyclerview-1.1.0.aar"
   info_path = "libs/androidx_recyclerview_recyclerview/androidx_recyclerview_recyclerview.info"
   deps = [
     ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
     ":androidx_core_core_java",
-    ":androidx_legacy_legacy_support_core_ui_java",
+    ":androidx_customview_customview_java",
   ]
 }
 
@@ -1223,18 +1226,22 @@ android_aar_prebuilt("google_play_services_vision_common_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("com_google_android_material_material_java") {
-  aar_path = "libs/com_google_android_material_material/material-1.0.0-rc02.aar"
+  aar_path =
+      "libs/com_google_android_material_material/material-1.2.0-alpha06.aar"
   info_path = "libs/com_google_android_material_material/com_google_android_material_material.info"
   deps = [
+    ":androidx_annotation_annotation_experimental_java",
     ":androidx_annotation_annotation_java",
     ":androidx_appcompat_appcompat_java",
     ":androidx_cardview_cardview_java",
+    ":androidx_coordinatorlayout_coordinatorlayout_java",
     ":androidx_core_core_java",
     ":androidx_fragment_fragment_java",
-    ":androidx_legacy_legacy_support_core_ui_java",
-    ":androidx_legacy_legacy_support_core_utils_java",
+    ":androidx_lifecycle_lifecycle_runtime_java",
     ":androidx_recyclerview_recyclerview_java",
     ":androidx_transition_transition_java",
+    ":androidx_vectordrawable_vectordrawable_java",
+    ":androidx_viewpager2_viewpager2_java",
   ]
 
   # Reduce binary size. https:crbug.com/954584
@@ -1624,6 +1631,16 @@ android_aar_prebuilt("androidx_activity_activity_java") {
   ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_annotation_annotation_experimental_java") {
+  aar_path = "libs/androidx_annotation_annotation_experimental/annotation-experimental-1.0.0.aar"
+  info_path = "libs/androidx_annotation_annotation_experimental/androidx_annotation_annotation_experimental.info"
+
+  # To remove visibility constraint, add this dependency to
+  # //third_party/android_deps/build.gradle.
+  visibility = [ ":*" ]
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("androidx_arch_core_core_common_java") {
   jar_path = "libs/androidx_arch_core_core_common/core-common-2.1.0.jar"
@@ -1834,7 +1851,7 @@ android_aar_prebuilt("androidx_test_espresso_espresso_idling_resource_java") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_transition_transition_java") {
-  aar_path = "libs/androidx_transition_transition/transition-1.0.0-rc02.aar"
+  aar_path = "libs/androidx_transition_transition/transition-1.2.0.aar"
   info_path =
       "libs/androidx_transition_transition/androidx_transition_transition.info"
 
@@ -1843,6 +1860,7 @@ android_aar_prebuilt("androidx_transition_transition_java") {
   visibility = [ ":*" ]
   deps = [
     ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
     ":androidx_core_core_java",
   ]
   deps += [ ":androidx_fragment_fragment_java" ]
@@ -1865,6 +1883,24 @@ android_aar_prebuilt("androidx_versionedparcelable_versionedparcelable_java") {
   ignore_aidl = true
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_viewpager2_viewpager2_java") {
+  aar_path = "libs/androidx_viewpager2_viewpager2/viewpager2-1.0.0.aar"
+  info_path =
+      "libs/androidx_viewpager2_viewpager2/androidx_viewpager2_viewpager2.info"
+
+  # To remove visibility constraint, add this dependency to
+  # //third_party/android_deps/build.gradle.
+  visibility = [ ":*" ]
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
+    ":androidx_core_core_java",
+    ":androidx_fragment_fragment_java",
+    ":androidx_recyclerview_recyclerview_java",
+  ]
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("backport_util_concurrent_backport_util_concurrent_java") {
   jar_path = "libs/backport_util_concurrent_backport_util_concurrent/backport-util-concurrent-3.1.jar"

third_party/android_deps/additional_readme_paths.json

@@ -9,6 +9,7 @@
     "libs/android_arch_lifecycle_viewmodel",
     "libs/androidx_activity_activity",
     "libs/androidx_annotation_annotation",
+    "libs/androidx_annotation_annotation_experimental",
     "libs/androidx_appcompat_appcompat",
     "libs/androidx_appcompat_appcompat_resources",
     "libs/androidx_arch_core_core_common",
@@ -67,6 +68,7 @@
     "libs/androidx_vectordrawable_vectordrawable",
     "libs/androidx_vectordrawable_vectordrawable_animated",
     "libs/androidx_versionedparcelable_versionedparcelable",
+    "libs/androidx_viewpager2_viewpager2",
     "libs/androidx_viewpager_viewpager",
     "libs/backport_util_concurrent_backport_util_concurrent",
     "libs/classworlds_classworlds",

third_party/android_deps/build.gradle

@@ -27,7 +27,6 @@ dependencies {
     compile "androidx.legacy:legacy-support-core-utils:${androidXSupportLibVersion}"
     compile "androidx.legacy:legacy-support-v4:${androidXSupportLibVersion}"
     compile "androidx.legacy:legacy-support-v13:${androidXSupportLibVersion}"
-
     compile "androidx.annotation:annotation:${androidXSupportLibVersion}"
     compile "androidx.appcompat:appcompat:1.2.0-beta01"
     compile "androidx.appcompat:appcompat-resources:1.2.0-beta01"
@@ -55,7 +54,7 @@ dependencies {
     compile "androidx.multidex:multidex:2.0.0"
 
     // Replacement for com.android.support:design
-    compile "com.google.android.material:material:1.0.0-rc02"
+    compile "com.google.android.material:material:1.2.0-alpha06"
 
     // Architecture components
     def archComponentsVersion = '1.1.1'

third_party/android_deps/libs/androidx_annotation_annotation_experimental/OWNERS

+file://third_party/android_deps/OWNERS
\ No newline at end of file

third_party/android_deps/libs/androidx_annotation_annotation_experimental/README.chromium

+Name: Experimental annotation
+Short Name: annotation-experimental
+URL: https://developer.android.com/jetpack/androidx
+Version: 1.0.0
+License: Apache Version 2.0
+License File: LICENSE
+Security Critical: yes
+
+Description:
+Java annotation for use on unstable Android API surfaces. When used in conjunction with the Experimental annotation lint checks, this annotation provides functional parity with Kotlin's Experimental annotation.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/androidx_annotation_annotation_experimental/androidx_annotation_annotation_experimental.info

+# Generated by //build/android/gyp/aar.py
+# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
+
+aidl = [  ]
+assets = [  ]
+has_classes_jar = true
+has_native_libraries = false
+has_proguard_flags = false
+has_r_text_file = false
+is_manifest_empty = true
+resources = [  ]
+subjar_tuples = [  ]
+subjars = [  ]

third_party/android_deps/libs/androidx_annotation_annotation_experimental/cipd.yaml

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:1.0.0-cr0
+package: chromium/third_party/android_deps/libs/androidx_annotation_annotation_experimental
+description: "Experimental annotation"
+data:
+- file: annotation-experimental-1.0.0.aar

third_party/android_deps/libs/androidx_coordinatorlayout_coordinatorlayout/README.chromium

 Name: Android Support Library Coordinator Layout
 Short Name: coordinatorlayout
-URL: http://developer.android.com/tools/extras/support-library.html
-Version: 1.0.0
+URL: https://developer.android.com/jetpack/androidx
+Version: 1.1.0
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_coordinatorlayout_coordinatorlayout/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.0.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.1.0-cr0
 package: chromium/third_party/android_deps/libs/androidx_coordinatorlayout_coordinatorlayout
 description: "Android Support Library Coordinator Layout"
 data:
-- file: coordinatorlayout-1.0.0.aar
+- file: coordinatorlayout-1.1.0.aar

third_party/android_deps/libs/androidx_recyclerview_recyclerview/README.chromium

 Name: Android Support RecyclerView v7
 Short Name: recyclerview
-URL: http://developer.android.com/tools/extras/support-library.html
-Version: 1.0.0
+URL: https://developer.android.com/jetpack/androidx
+Version: 1.1.0
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_recyclerview_recyclerview/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.0.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.1.0-cr0
 package: chromium/third_party/android_deps/libs/androidx_recyclerview_recyclerview
 description: "Android Support RecyclerView v7"
 data:
-- file: recyclerview-1.0.0.aar
+- file: recyclerview-1.1.0.aar

third_party/android_deps/libs/androidx_transition_transition/README.chromium

 Name: Android Transition Support Library
 Short Name: transition
-URL: http://developer.android.com/tools/extras/support-library.html
-Version: 1.0.0-rc02
+URL: https://developer.android.com/jetpack/androidx
+Version: 1.2.0
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_transition_transition/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.0.0-rc02-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.2.0-cr0
 package: chromium/third_party/android_deps/libs/androidx_transition_transition
 description: "Android Transition Support Library"
 data:
-- file: transition-1.0.0-rc02.aar
+- file: transition-1.2.0.aar

third_party/android_deps/libs/androidx_viewpager2_viewpager2/OWNERS

+file://third_party/android_deps/OWNERS
\ No newline at end of file

third_party/android_deps/libs/androidx_viewpager2_viewpager2/README.chromium

+Name: AndroidX Widget ViewPager2
+Short Name: viewpager2
+URL: https://developer.android.com/jetpack/androidx
+Version: 1.0.0
+License: Apache Version 2.0
+License File: LICENSE
+Security Critical: yes
+
+Description:
+AndroidX Widget ViewPager2
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/androidx_viewpager2_viewpager2/androidx_viewpager2_viewpager2.info

+# Generated by //build/android/gyp/aar.py
+# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
+
+aidl = [  ]
+assets = [  ]
+has_classes_jar = true
+has_native_libraries = false
+has_proguard_flags = false
+has_r_text_file = true
+is_manifest_empty = true
+resources = [ "res/values/values.xml" ]
+subjar_tuples = [  ]
+subjars = [  ]

third_party/android_deps/libs/androidx_viewpager2_viewpager2/cipd.yaml

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:1.0.0-cr0
+package: chromium/third_party/android_deps/libs/androidx_viewpager2_viewpager2
+description: "AndroidX Widget ViewPager2"
+data:
+- file: viewpager2-1.0.0.aar

third_party/android_deps/libs/com_google_android_material_material/README.chromium

 Name: Material Components for Android
 Short Name: material
-URL: http://developer.android.com/tools/extras/support-library.html
-Version: 1.0.0-rc02
+URL: https://github.com/material-components/material-components-android
+Version: 1.2.0-alpha06
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/com_google_android_material_material/cipd.yaml

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.0.0-rc02-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.2.0-alpha06-cr0
 package: chromium/third_party/android_deps/libs/com_google_android_material_material
 description: "Material Components for Android"
 data:
-- file: material-1.0.0-rc02.aar
+- file: material-1.2.0-alpha06.aar