diff options
author | Adrian Roos <roosa@google.com> | 2015-05-25 18:48:14 -0700 |
---|---|---|
committer | Adrian Roos <roosa@google.com> | 2015-05-26 16:38:59 -0700 |
commit | 28828b5f627a1024fa64f1c927cd8828d36ae625 (patch) | |
tree | 86c0efed748b1cd952c8bfab82723d95bf3f90e3 /packages/Keyguard/res | |
parent | 2d9c6015b32338f1b82f46ec7ea7328422f0330a (diff) | |
download | frameworks_base-28828b5f627a1024fa64f1c927cd8828d36ae625.zip frameworks_base-28828b5f627a1024fa64f1c927cd8828d36ae625.tar.gz frameworks_base-28828b5f627a1024fa64f1c927cd8828d36ae625.tar.bz2 |
Hide KeyguardMessageArea if empty
Also removes dead code.
Bug: 20729651
Change-Id: I3a6bee34c5b37fcc304199eb76f31d365c6bb0b4
Diffstat (limited to 'packages/Keyguard/res')
3 files changed, 4 insertions, 3 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml b/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml index 9b55e5b..3ea22e9 100644 --- a/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml +++ b/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml @@ -26,8 +26,7 @@ android:orientation="vertical" android:gravity="center" android:layout_gravity="center_horizontal" - android:layout_alignParentBottom="true" - android:clickable="true"> + android:layout_alignParentBottom="true"> <com.android.keyguard.CarrierText android:id="@+id/carrier_text" diff --git a/packages/Keyguard/res/layout/keyguard_message_area.xml b/packages/Keyguard/res/layout/keyguard_message_area.xml index a709e98..46aa39d 100644 --- a/packages/Keyguard/res/layout/keyguard_message_area.xml +++ b/packages/Keyguard/res/layout/keyguard_message_area.xml @@ -29,5 +29,5 @@ android:textAppearance="?android:attr/textAppearance" android:textSize="@dimen/kg_status_line_font_size" android:textColor="?android:attr/textColorSecondary" - android:clickable="true" /> + android:focusable="true" /> diff --git a/packages/Keyguard/res/layout/keyguard_pattern_view.xml b/packages/Keyguard/res/layout/keyguard_pattern_view.xml index 6148065..0f5431e 100644 --- a/packages/Keyguard/res/layout/keyguard_pattern_view.xml +++ b/packages/Keyguard/res/layout/keyguard_pattern_view.xml @@ -65,6 +65,8 @@ android:layout_gravity="center_horizontal" android:gravity="center" android:contentDescription="@string/keyguard_accessibility_pattern_area" + android:focusable="true" + android:focusableInTouchMode="true" android:clipChildren="false" android:clipToPadding="false" /> |