From c58cc7dea8546adcec04d6fab092caa87fee4ce5 Mon Sep 17 00:00:00 2001
From: Setup Wizard Team <android-setup-team-eng@google.com>
Date: Wed, 29 May 2019 09:29:52 +0800
Subject: Import updated Android SetupCompat Library 250403217

Copied from google3/third_party/java_src/android_libs/setupcompat

Test: mm
Bug: 133875040

Included changes:
  - 250403217 Remove TemplateLayout.getContainerId
  - 249987615 Roll forward cl/249765689 again and fix build fail gmscor...
  - 249800998 rollback cl/249765689 to avoid build fail gmscore testing
  - 249765689 Remove "suc_layout_title" from setupCompat PartnerCustomi...

PiperOrigin-RevId: 250403217
Change-Id: If964d2a9f17f72c0c84486c615c7f914a094feb5
---
 .../android/setupcompat/internal/TemplateLayout.java       | 14 --------------
 main/res/layout/partner_customization_layout.xml           |  5 -----
 2 files changed, 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"
-- 
cgit v1.2.3