diff options
| author | Austin Wang <wangaustin@google.com> | 2019-12-03 10:08:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-12-03 10:08:27 +0000 |
| commit | 14a2a901bdf28cb5b0e68aab9f1997a6586a7fe6 (patch) | |
| tree | e3a009e4d56f9dc47d128c7e8463098ea0b99368 | |
| parent | ee207f0241a3acc72e1484d7b8e8d6e0790f5236 (diff) | |
| parent | 25fc3fd49fc6a3635d2db416bcf212bc47682e88 (diff) | |
Merge "Remove keyguard_indication_area_overlay"
3 files changed, 19 insertions, 27 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 1bfc4c05c92c..b90a3719b08f 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -24,7 +24,25 @@ android:outlineProvider="none" android:elevation="5dp" > <!-- Put it above the status bar header --> - <include layout="@layout/keyguard_indication_area_overlay" /> + <LinearLayout + android:id="@+id/keyguard_indication_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom" + android:layout_gravity="bottom|center_horizontal" + android:orientation="vertical"> + + <com.android.systemui.statusbar.phone.KeyguardIndicationTextView + android:id="@+id/keyguard_indication_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:paddingStart="@dimen/keyguard_indication_text_padding" + android:paddingEnd="@dimen/keyguard_indication_text_padding" + android:textAppearance="@style/TextAppearance.Keyguard.BottomArea" + android:accessibilityLiveRegion="polite"/> + + </LinearLayout> <FrameLayout android:id="@+id/preview_container" diff --git a/packages/SystemUI/res/layout/keyguard_indication_area_overlay.xml b/packages/SystemUI/res/layout/keyguard_indication_area_overlay.xml deleted file mode 100644 index cc30a682757c..000000000000 --- a/packages/SystemUI/res/layout/keyguard_indication_area_overlay.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/keyguard_indication_area" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom" - android:layout_gravity="bottom|center_horizontal" - android:orientation="vertical"> - - <include layout="@layout/keyguard_indication_text_view" /> - -</LinearLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/keyguard_indication_text_view.xml b/packages/SystemUI/res/layout/keyguard_indication_text_view.xml deleted file mode 100644 index 9376b1f04cc8..000000000000 --- a/packages/SystemUI/res/layout/keyguard_indication_text_view.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <com.android.systemui.statusbar.phone.KeyguardIndicationTextView - android:id="@+id/keyguard_indication_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center" - android:paddingStart="@dimen/keyguard_indication_text_padding" - android:paddingEnd="@dimen/keyguard_indication_text_padding" - android:textAppearance="@style/TextAppearance.Keyguard.BottomArea" - android:accessibilityLiveRegion="polite"/> -</merge>
\ No newline at end of file |