diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2019-05-29 09:29:52 +0800 |
---|---|---|
committer | Nicole Huang <nicolehuang@google.com> | 2019-06-04 16:56:02 +0800 |
commit | c58cc7dea8546adcec04d6fab092caa87fee4ce5 (patch) | |
tree | 8933cb50c96b08d25227fa65d70b55b5e825958e | |
parent | cc4550f107459ab3e1cf3439730500ce0f0f0211 (diff) | |
download | setupcompat-c58cc7dea8546adcec04d6fab092caa87fee4ce5.tar.gz |
Import updated Android SetupCompat Library 250403217android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-release
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
-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" |