Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Bug: 135460123
Change-Id: Id120fc9ec25c67cd4db5ddb5eca7f1a43fc4e836
Merged-In: Iba2b0e6a1bff477aed2f1bbd9b599bbcf2eea942

2 files changed, 0 insertions, 19 deletions

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 @@ public class TemplateLayout extends FrameLayout {
   }
 
   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 @@ public class TemplateLayout extends FrameLayout {
    */
   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"