diff options
| author | Setup Wizard Team <android-setup-team-eng@google.com> | 2019-06-04 20:05:11 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-04 20:05:11 -0700 |
| commit | bcc1844094d9c402b0c3685dc8a4bd4655d08f53 (patch) | |
| tree | 1570144522be0103db9e0da6a21e2c1a0728ea80 | |
| parent | 9d7267738ce83f61d05ee03d625f543fca464dab (diff) | |
| parent | cde9b13b2682d852e803dce314a6a7f7a956bec5 (diff) | |
| download | setupcompat-bcc1844094d9c402b0c3685dc8a4bd4655d08f53.tar.gz | |
Import updated Android SetupCompat Library 250403217 am: c58cc7dea8
am: cde9b13b26
Change-Id: Id05c8dd2ae044f98aa18e6410db553cc40400ad7
| -rw-r--r-- | main/java/com/google/android/setupcompat/internal/TemplateLayout.java | 14 | ||||
| -rw-r--r-- | main/res/layout/partner_customization_layout.xml | 5 |
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" |