diff options
| author | Philip Milne <pmilne@google.com> | 2011-06-22 10:18:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-22 10:18:32 -0700 |
| commit | 0edc52970f82b6a42324ebec9458b3098112e499 (patch) | |
| tree | e9ad2c61d499150396c95cc7eda8977b6713376d /core/res | |
| parent | 8969d9924c662ab4cdacc342bbdc33756db730be (diff) | |
| parent | 1fd16378812792913a6aa6923acbec20037e09ff (diff) | |
| download | frameworks_base-0edc52970f82b6a42324ebec9458b3098112e499.zip frameworks_base-0edc52970f82b6a42324ebec9458b3098112e499.tar.gz frameworks_base-0edc52970f82b6a42324ebec9458b3098112e499.tar.bz2 | |
Merge "Minor tweaks to GridLayout for KeyGuardScreenUnlock."
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/layout/keyguard_screen_unlock_portrait.xml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index dd68d82..03c6022 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -101,6 +101,10 @@ android:visibility="gone" /> + <!-- We need MATCH_PARENT here only to force the size of the parent to be passed to + the pattern view for it to compute its size. This is an unusual case, caused by + LockPatternView's requirement to maintain a square aspect ratio based on the width + of the screen. --> <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" android:layout_width="match_parent" @@ -109,6 +113,8 @@ android:layout_marginRight="8dip" android:layout_marginBottom="4dip" android:layout_marginLeft="8dip" + android:layout_gravity="center|bottom" + android:layout_rowWeight="1" /> <TextView @@ -123,8 +129,7 @@ <!-- Footer: an emergency call button and an initially hidden "Forgot pattern" button --> <LinearLayout android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_gravity="center"> + android:layout_gravity="fill_horizontal"> <Button android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" |