diff options
| author | Jim Miller <jaggies@google.com> | 2012-10-19 18:41:25 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-10-19 18:42:56 -0700 |
| commit | 838906b165e4d3cb2c512b2db344aa50cb5d4751 (patch) | |
| tree | 74616102d1a70210f35daea561cc17f1a09dc5b2 /core/res/res/layout-port | |
| parent | c7eebe91ee107e40e9df8338c728d39e9db37ae8 (diff) | |
| download | frameworks_base-838906b165e4d3cb2c512b2db344aa50cb5d4751.tar.gz frameworks_base-838906b165e4d3cb2c512b2db344aa50cb5d4751.tar.bz2 frameworks_base-838906b165e4d3cb2c512b2db344aa50cb5d4751.zip | |
Get basic keyguard working in new branch
This merges the changes from the proto app into the framework.
Basic functionality tested on phone in portrait:
- Slide
- Pattern
- PIN
- Password (wonky)
- SIM PIN
Change-Id: I21b2c30cf05dc01ffb20948f41a044e7af1db25f
Diffstat (limited to 'core/res/res/layout-port')
| -rw-r--r-- | core/res/res/layout-port/keyguard_host_view.xml | 53 |
1 files changed, 38 insertions, 15 deletions
diff --git a/core/res/res/layout-port/keyguard_host_view.xml b/core/res/res/layout-port/keyguard_host_view.xml index 981fe6d0da5..dc556ef9fb2 100644 --- a/core/res/res/layout-port/keyguard_host_view.xml +++ b/core/res/res/layout-port/keyguard_host_view.xml @@ -27,22 +27,45 @@ android:gravity="center_horizontal" android:orientation="vertical"> - <include layout="@layout/keyguard_widget_region" + <include layout="@layout/keyguard_widget_pager" android:layout_width="match_parent" - android:layout_height="153dp" /> + android:layout_height="match_parent" /> + + <SlidingDrawer + android:id="@+id/drawer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + + android:handle="@+id/handle" + android:content="@+id/keyguard_security_container"> + + <ImageView + android:id="@id/handle" + android:layout_width="88dip" + android:layout_height="44dip" + android:src="@drawable/security_handle" /> + + <com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer + android:id="@id/keyguard_security_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="bottom|center_horizontal" + android:background="@drawable/security_frame"> + <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper + android:id="@+id/view_flipper" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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:paddingBottom="@dimen/keyguard_security_view_margin" + android:gravity="center"> + </com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper> + </com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer> + + </SlidingDrawer> - <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper - android:id="@+id/view_flipper" - android:layout_width="match_parent" - android:layout_height="0dip" - android:clipChildren="false" - android:clipToPadding="false" - android:layout_weight="1" - android:paddingLeft="@dimen/keyguard_security_view_margin" - android:paddingTop="@dimen/keyguard_security_view_margin" - android:paddingRight="@dimen/keyguard_security_view_margin" - android:paddingBottom="@dimen/keyguard_security_view_margin" - android:gravity="center"> - </com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper> </com.android.internal.policy.impl.keyguard.KeyguardHostView> |