Skip to content

Commit 6f35209

Browse files
committed
Integrate assets from UX; drag/bouncer animation behavior in slider
Integrated changes from prototype app Change-Id: I5f017431531b6d12aca89a674d865402c60c2104
1 parent 9b1db68 commit 6f35209

File tree

12 files changed

+124
-26
lines changed

12 files changed

+124
-26
lines changed
219 Bytes
Loading
233 Bytes
Loading
1.85 KB
Loading
186 Bytes
Loading
197 Bytes
Loading
1.49 KB
Loading
240 Bytes
Loading
263 Bytes
Loading
2.43 KB
Loading

core/res/res/layout-port/keyguard_host_view.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
android:id="@+id/sliding_layout"
3333
android:layout_width="match_parent"
3434
android:layout_height="match_parent"
35-
androidprv:dragHandle="@drawable/security_handle">
35+
androidprv:dragHandle="@drawable/kg_security_grip"
36+
androidprv:dragIcon="@drawable/kg_security_lock">
3637

3738
<FrameLayout
3839
android:layout_width="match_parent"
@@ -53,8 +54,10 @@
5354
android:layout_width="wrap_content"
5455
android:layout_height="wrap_content"
5556
androidprv:layout_childType="challenge"
56-
android:gravity="bottom|center_horizontal"
57-
android:background="@drawable/security_frame">
57+
android:layout_marginLeft="@dimen/kg_edge_swipe_region_size"
58+
android:layout_marginRight="@dimen/kg_edge_swipe_region_size"
59+
android:background="@drawable/kg_bouncer_bg_white"
60+
android:gravity="bottom|center_horizontal">
5861
<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper
5962
android:id="@+id/view_flipper"
6063
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)