diff options
| author | myzb <myzb.dev@gmail.com> | 2015-11-20 11:28:03 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-11-24 17:13:48 -0800 |
| commit | 381451bc6d92ab1f37314bdc1f3cd997e33655fb (patch) | |
| tree | f1db10c4c26257e2eb8c0ac6cf54f493dfad1119 /packages/SystemUI/res/layout | |
| parent | 848baf955a63f04e5d132722b138169a253c0be0 (diff) | |
| download | frameworks_base-381451bc6d92ab1f37314bdc1f3cd997e33655fb.zip frameworks_base-381451bc6d92ab1f37314bdc1f3cd997e33655fb.tar.gz frameworks_base-381451bc6d92ab1f37314bdc1f3cd997e33655fb.tar.bz2 | |
Keyguard: Squash undo UI changes after merge of branch 'LA.BF64.1.2.2_rb4.7'
Revert "Hide emergency button when OOS"
This reverts commit 5ccaaff4818af8d48e072cbd2b8b784e5cd0c593.
* Buggy on MSIM, making the button perma enable.
Revert "EmergencyCall Button on Swipe Lock Screen"
This reverts commit 5f712cc90ebb11a04e72ab6b04a1229eeddef9fc.
* Introduces some ugly padding to make room for a button we have
disabled by default since forever.
Revert "Emergency call button on Swipe lock Screen."
This reverts commit f17cb289ae5f760a51b8463fe270b336d1e3b408.
* See above, adds the option to enable the button itself.
Conflicts:
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
Change-Id: Ie95f0b075e25b625298eac3c06d278e6cb1e7b17
Diffstat (limited to 'packages/SystemUI/res/layout')
| -rw-r--r-- | packages/SystemUI/res/layout/keyguard_bottom_area.xml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 46269d2..6c85a8f 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -36,15 +36,6 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:accessibilityLiveRegion="polite" /> - <include layout="@layout/keyguard_eca" - android:id="@+id/keyguard_selector_fade_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="36dp" - android:orientation="vertical" - android:layout_gravity="bottom|center_horizontal" - android:gravity="center_horizontal" /> - <FrameLayout android:id="@+id/preview_container" android:layout_width="match_parent" |