diff options
| author | Setup Wizard Team <android-setup-team-eng@google.com> | 2019-06-04 19:43:07 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-04 19:43:07 -0700 |
| commit | cde9b13b2682d852e803dce314a6a7f7a956bec5 (patch) | |
| tree | 8933cb50c96b08d25227fa65d70b55b5e825958e | |
| parent | 85b4083a6fedefef7002d02f01d5317a240fe5b4 (diff) | |
| parent | c58cc7dea8546adcec04d6fab092caa87fee4ce5 (diff) | |
| download | setupcompat-cde9b13b2682d852e803dce314a6a7f7a956bec5.tar.gz | |
Import updated Android SetupCompat Library 250403217
am: c58cc7dea8
Change-Id: I89c24e2a87dfbcc30252c8244ff1428e057e8dfe
| -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" |