diff options
| author | Adam Powell <adamp@google.com> | 2012-10-30 20:56:45 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2012-10-30 20:57:10 -0700 |
| commit | cdf8b487456115a1bcc626f53b8da63308dc42dd (patch) | |
| tree | ceb06be12984436de245d931b28d200f30e9c117 /core/res/res/layout-port | |
| parent | e0ec5d428f80fe49b291a0e0edd51a4398bde609 (diff) | |
| download | frameworks_base-cdf8b487456115a1bcc626f53b8da63308dc42dd.tar.gz frameworks_base-cdf8b487456115a1bcc626f53b8da63308dc42dd.tar.bz2 frameworks_base-cdf8b487456115a1bcc626f53b8da63308dc42dd.zip | |
Fix keyguard bugs
Integrate from proto app
Get some layout/alignment right between security views, bouncer,
etc. Expand the space available for the more cramped security views
when not in the bouncer.
Fix bug 7434391 - don't allow widget swiping in bouncer mode. Fix a
few other bouncer-related state tracking problems as well.
Use layers when moving the security view around.
Change-Id: Ied14bab8bb5c3d997c734a3ae657b766c427253f
Diffstat (limited to 'core/res/res/layout-port')
| -rw-r--r-- | core/res/res/layout-port/keyguard_host_view.xml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/res/res/layout-port/keyguard_host_view.xml b/core/res/res/layout-port/keyguard_host_view.xml index 544447149eb..a3c81054537 100644 --- a/core/res/res/layout-port/keyguard_host_view.xml +++ b/core/res/res/layout-port/keyguard_host_view.xml @@ -36,7 +36,8 @@ <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + androidprv:layout_childType="widgets"> <include layout="@layout/keyguard_widget_pager" android:id="@+id/app_widget_container" android:layout_width="match_parent" @@ -51,12 +52,11 @@ <com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer android:id="@+id/keyguard_security_container" - android:layout_width="@dimen/keyguard_security_width" + android:layout_width="wrap_content" android:layout_height="@dimen/keyguard_security_height" androidprv:layout_childType="challenge" - android:layout_marginLeft="@dimen/kg_edge_swipe_region_size" - android:layout_marginRight="@dimen/kg_edge_swipe_region_size" android:background="@drawable/kg_bouncer_bg_white" + android:padding="0dp" android:gravity="bottom|center_horizontal"> <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper android:id="@+id/view_flipper" @@ -64,9 +64,7 @@ android:layout_height="match_parent" android:clipChildren="false" android:clipToPadding="false" - android:paddingLeft="@dimen/keyguard_security_view_margin" android:paddingTop="@dimen/keyguard_security_view_margin" - android:paddingRight="@dimen/keyguard_security_view_margin" android:gravity="center"> </com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper> </com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer> |