Import updated Android Setupdesign Library 230837776

Test: mm
PiperOrigin-RevId: 230837776
Change-Id: I962e3b0c2ea3e124e16b5e466485912d8123b2f5

8 files changed, 9 insertions, 69 deletions

diff --git a/main/res/layout/sud_glif_footer_button_bar.xml b/main/res/layout/sud_glif_footer_button_bar.xml
deleted file mode 100644
index e0a796d..0000000
--- a/main/res/layout/sud_glif_footer_button_bar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (C) 2017 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<com.google.android.setupdesign.view.ButtonBarLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/sud_footer_button_bar"
-    style="@style/SudGlifButtonBar.Stackable"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
diff --git a/main/res/layout/sud_glif_preference_template_header.xml b/main/res/layout/sud_glif_preference_template_header.xml
deleted file mode 100644
index d736392..0000000
--- a/main/res/layout/sud_glif_preference_template_header.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (C) 2016 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:ignore="UnusedResources">
-    <!-- Ignore UnusedResources: can be used by clients -->
-
-    <FrameLayout
-        android:id="@+id/sud_layout_content"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/sud_layout_navigation_bar"
-        style="@style/SudNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
-
-</LinearLayout>
diff --git a/main/res/layout/sud_no_scroll_template_header_collapsed.xml b/main/res/layout/sud_no_scroll_template_header_collapsed.xml
index af50e0a..db78a01 100644
--- a/main/res/layout/sud_no_scroll_template_header_collapsed.xml
+++ b/main/res/layout/sud_no_scroll_template_header_collapsed.xml
@@ -42,7 +42,8 @@
 
     <include layout="@layout/sud_progress_bar_stub" />
 
-    <FrameLayout android:id="@+id/sud_layout_content"
+    <FrameLayout
+        android:id="@+id/sud_layout_content"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1" />
diff --git a/main/res/layout/sud_recycler_template_header_collapsed.xml b/main/res/layout/sud_recycler_template_header_collapsed.xml
index 3aecacb..44432a0 100644
--- a/main/res/layout/sud_recycler_template_header_collapsed.xml
+++ b/main/res/layout/sud_recycler_template_header_collapsed.xml
@@ -50,7 +50,8 @@
             android:layout_height="match_parent"
             android:scrollbars="vertical" />
 
-        <FrameLayout android:id="@+id/sud_layout_content"
+        <FrameLayout
+            android:id="@+id/sud_layout_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
diff --git a/main/res/layout/sud_template_card_wide.xml b/main/res/layout/sud_template_card_wide.xml
index 3b57da2..92700cb 100644
--- a/main/res/layout/sud_template_card_wide.xml
+++ b/main/res/layout/sud_template_card_wide.xml
@@ -56,7 +56,8 @@
                     android:layout_height="match_parent"
                     android:fillViewport="true">
 
-                    <FrameLayout android:id="@+id/sud_layout_content"
+                    <FrameLayout
+                        android:id="@+id/sud_layout_content"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:clipChildren="false" />
diff --git a/main/res/layout/sud_template_header_collapsed.xml b/main/res/layout/sud_template_header_collapsed.xml
index 420df04..edceed1 100644
--- a/main/res/layout/sud_template_header_collapsed.xml
+++ b/main/res/layout/sud_template_header_collapsed.xml
@@ -53,7 +53,8 @@
         android:layout_weight="1"
         android:fillViewport="true">
 
-        <FrameLayout android:id="@+id/sud_layout_content"
+        <FrameLayout
+            android:id="@+id/sud_layout_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:clipChildren="false" />
diff --git a/main/res/values/config.xml b/main/res/values/config.xml
index 4847358..daa00d3 100644
--- a/main/res/values/config.xml
+++ b/main/res/values/config.xml
@@ -23,10 +23,6 @@
     <!-- Whether to use tablet layout -->
     <bool name="sudUseTabletLayout">false</bool>
 
-    <!-- ID used with setTag(int, Object) to store the original weight of a view inside
-         ButtonBarLayout -->
-    <item name="sud_original_weight" type="id" />
-
     <!-- Secondary font for use with headings, title, and other non-body text -->
     <string name="sudFontSecondary" translatable="false">google-sans</string>
     <string name="sudFontSecondaryMedium" translatable="false">google-sans-medium</string>
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml
index 7711dd4..b0a3c0c 100644
--- a/main/res/values/styles.xml
+++ b/main/res/values/styles.xml
@@ -437,6 +437,7 @@
         <item name="android:paddingRight">@dimen/sud_glif_button_padding</item>
         <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">?attr/sudButtonAllCaps</item>
         <item name="textAllCaps">?attr/sudButtonAllCaps</item>
+        <item name="android:stateListAnimator">@null</item>
 
         <!-- Values used in themes -->
         <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/sudButtonCornerRadius</item>