Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Better layout for Face Unlock on 600dp tablet" into jb-mr1-dev

Browse Source
This commit is contained in:
Jim Miller
2012-09-06 18:56:03 -07:00
committed by Android (Google) Code Review
parent a56f8f7ca2 85ab8e82e9
commit c71d406060
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/layout-sw600dp-port/keyguard_host_view.xml
View File

@@ -32,7 +32,7 @@
android:id="@+id/app_widget_container" android:id="@+id/app_widget_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="0.4"
android:visibility="gone"> android:visibility="gone">
<!-- TODO: Remove this once supported as a widget --> <!-- TODO: Remove this once supported as a widget -->
@@ -44,7 +44,7 @@
android:id="@+id/view_flipper" android:id="@+id/view_flipper"
android:layout_width="@dimen/kg_security_view_width" android:layout_width="@dimen/kg_security_view_width"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="0.6"
android:layout_gravity="center"> android:layout_gravity="center">
<include layout="@layout/keyguard_selector_view"/> <include layout="@layout/keyguard_selector_view"/>

3
core/res/res/values-sw600dp/dimens.xml
View File

@@ -45,6 +45,9 @@
<!-- Size of lockscreen outerring on unsecure unlock LockScreen --> <!-- Size of lockscreen outerring on unsecure unlock LockScreen -->
<dimen name="keyguard_lockscreen_outerring_diameter">364dp</dimen> <dimen name="keyguard_lockscreen_outerring_diameter">364dp</dimen>
<!-- Height of FaceUnlock view in keyguard -->
<dimen name="face_unlock_height">430dip</dimen>
<!-- target placement radius for GlowPadView. Should be 1/2 of outerring diameter. --> <!-- target placement radius for GlowPadView. Should be 1/2 of outerring diameter. -->
<dimen name="glowpadview_target_placement_radius">182dip</dimen> <dimen name="glowpadview_target_placement_radius">182dip</dimen>

2
core/res/res/values/dimens.xml
View File

@@ -193,7 +193,7 @@
<!-- Padding on left margin of PIN text entry field to center it when del button is showing --> <!-- Padding on left margin of PIN text entry field to center it when del button is showing -->
<dimen name="keyguard_lockscreen_pin_margin_left">40dip</dimen> <dimen name="keyguard_lockscreen_pin_margin_left">40dip</dimen>
<!-- Height of FaceUnlock widget in keyguard --> <!-- Height of FaceUnlock view in keyguard -->
<dimen name="face_unlock_height">330dip</dimen> <dimen name="face_unlock_height">330dip</dimen>
<!-- Minimum popup width for selecting an activity in ActivityChooserDialog/ActivityChooserView. --> <!-- Minimum popup width for selecting an activity in ActivityChooserDialog/ActivityChooserView. -->