Merge tag 'android-security-10.0.0_r53' into int/10/fp2
Android security 10.0.0 release 53
* tag 'android-security-10.0.0_r53':
Change-Id: I364eebde7b550fb11e833046c05af01955c9338a
diff --git a/main/java/com/google/android/setupcompat/internal/TemplateLayout.java b/main/java/com/google/android/setupcompat/internal/TemplateLayout.java
index c6eba37..34179d6 100644
--- a/main/java/com/google/android/setupcompat/internal/TemplateLayout.java
+++ b/main/java/com/google/android/setupcompat/internal/TemplateLayout.java
@@ -192,10 +192,6 @@
}
protected ViewGroup findContainer(int containerId) {
- if (containerId == 0) {
- // Maintain compatibility with the deprecated way of specifying container ID.
- containerId = getContainerId();
- }
return (ViewGroup) findViewById(containerId);
}
@@ -214,16 +210,6 @@
*/
protected void onBeforeTemplateInflated(AttributeSet attrs, int defStyleAttr) {}
- /**
- * @return ID of the default container for this layout. This will be used to find the container
- * ViewGroup, which all children views of this layout will be placed in.
- * @deprecated Override {@link #findContainer(int)} instead.
- */
- @Deprecated
- protected int getContainerId() {
- return 0;
- }
-
/* Animator support */
private float xFraction;
diff --git a/main/res/layout/partner_customization_layout.xml b/main/res/layout/partner_customization_layout.xml
index 30ef2b0..c3c1c38 100644
--- a/main/res/layout/partner_customization_layout.xml
+++ b/main/res/layout/partner_customization_layout.xml
@@ -26,11 +26,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <TextView
- android:id="@+id/suc_layout_title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
<FrameLayout
android:id="@+id/suc_layout_content"
android:layout_width="match_parent"