summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorBrian Colonna <bcolonna@google.com>2012-04-05 15:58:48 -0400
committerBrian Colonna <bcolonna@google.com>2012-04-05 15:58:48 -0400
commitcf8d9073a66072a5a94ebbe24003eb63c18906f5 (patch)
tree20cdffa6e058497f2cf38c2a41f5aef172a1ca95 /core/res
parent1c35d117f01b5a6f66b82c57eb29350f16694070 (diff)
downloadframeworks_base-cf8d9073a66072a5a94ebbe24003eb63c18906f5.zip
frameworks_base-cf8d9073a66072a5a94ebbe24003eb63c18906f5.tar.gz
frameworks_base-cf8d9073a66072a5a94ebbe24003eb63c18906f5.tar.bz2
Fix 5849324: Changed FUL extents for pattern backup
The extents of FUL when using PIN unlock are such that there are 4 dps of space between FUL and the adjacent text above and below. The extents of FUL when using pattern backup were such that FUL was very far below the adjacent text above. Pattern backup is now consistent with PIN backup - 4 dps of space between FUL and the adjacent text above and below. Note that it is not possible for FUL to be the same exact size when using pattern backup vs. PIN backup because the rest of the layout is different. Making it a consistent distance from the surrounding text is the best we can do. To fix this, the FUL area simply had to cover an extra row in the grid layout (a space view), and the top and bottom margins had to be set to 4 dp. Since only the FUL view is affected, it does not impact the rest of the layout. This has been tested on both a Prime and Crespo to make sure it works across different size devices. All lock methods have been tested to make sure other methods were not affected. Change-Id: I518f1b616cf7bedc510979d422ebc72e07a5aff4
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/layout/keyguard_screen_unlock_portrait.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
index 9a2e024..35b8665 100644
--- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
@@ -173,13 +173,13 @@
<RelativeLayout
android:id="@+id/faceLockAreaView"
android:visibility="invisible"
- android:layout_row="4"
+ android:layout_row="3"
android:layout_column="0"
- android:layout_rowSpan="1"
+ android:layout_rowSpan="2"
android:layout_columnSpan="1"
android:layout_gravity="fill"
- android:layout_marginTop="8dip"
- android:layout_marginBottom="8dip"
+ android:layout_marginTop="4dip"
+ android:layout_marginBottom="4dip"
android:layout_width="0dip"
android:layout_height="0dip"
android:background="@drawable/intro_bg">