summaryrefslogtreecommitdiffstats
path: root/core/res/res/layout-port
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2012-10-25 20:49:32 -0700
committerAdam Powell <adamp@google.com>2012-10-25 21:28:27 -0700
commit6f35209e728a7a9a56afbbdefd3d7bfa1e05ea73 (patch)
tree2881e8b5f88ca9afd37ca5bf2ce8401558253b74 /core/res/res/layout-port
parent9b1db682c32d103974b0f1193b50e77e254d5589 (diff)
downloadframeworks_base-6f35209e728a7a9a56afbbdefd3d7bfa1e05ea73.tar.gz
frameworks_base-6f35209e728a7a9a56afbbdefd3d7bfa1e05ea73.tar.bz2
frameworks_base-6f35209e728a7a9a56afbbdefd3d7bfa1e05ea73.zip
Integrate assets from UX; drag/bouncer animation behavior in slider
Integrated changes from prototype app Change-Id: I5f017431531b6d12aca89a674d865402c60c2104
Diffstat (limited to 'core/res/res/layout-port')
-rw-r--r--core/res/res/layout-port/keyguard_host_view.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/core/res/res/layout-port/keyguard_host_view.xml b/core/res/res/layout-port/keyguard_host_view.xml
index 98091359cce..ccc1692861a 100644
--- a/core/res/res/layout-port/keyguard_host_view.xml
+++ b/core/res/res/layout-port/keyguard_host_view.xml
@@ -32,7 +32,8 @@
android:id="@+id/sliding_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- androidprv:dragHandle="@drawable/security_handle">
+ androidprv:dragHandle="@drawable/kg_security_grip"
+ androidprv:dragIcon="@drawable/kg_security_lock">
<FrameLayout
android:layout_width="match_parent"
@@ -53,8 +54,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
androidprv:layout_childType="challenge"
- android:gravity="bottom|center_horizontal"
- android:background="@drawable/security_frame">
+ 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:gravity="bottom|center_horizontal">
<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper
android:id="@+id/view_flipper"
android:layout_width="wrap_content"