diff options
| author | Jim Miller <jaggies@google.com> | 2011-06-17 19:55:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-17 19:55:55 -0700 |
| commit | 93f9e1ca1ce2e5456f0a4f0090a7b2a8a473cf36 (patch) | |
| tree | 122a1938f824d4175e699d2092b6540c36a9d404 | |
| parent | 94c9f39ece18183c3ad2ad224ddb4690e3dd5045 (diff) | |
| parent | 5b1acf9c3e5229a4df7506e3880c17c16c53aeab (diff) | |
| download | frameworks_base-93f9e1ca1ce2e5456f0a4f0090a7b2a8a473cf36.zip frameworks_base-93f9e1ca1ce2e5456f0a4f0090a7b2a8a473cf36.tar.gz frameworks_base-93f9e1ca1ce2e5456f0a4f0090a7b2a8a473cf36.tar.bz2 | |
Merge "Temporary workaround for conflict in GridLayout/LockScreen."
| -rw-r--r-- | core/res/res/layout/keyguard_screen_unlock_portrait.xml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index 0132b6c..4ffa340 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -63,10 +63,8 @@ <LinearLayout android:orientation="horizontal" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="0dip" - android:layout_marginLeft="12dip" android:layout_gravity="right"> <TextView @@ -114,8 +112,8 @@ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_width="300dip" + android:layout_height="300dip" android:layout_rowWeight="1" android:layout_marginTop="8dip" android:layout_marginRight="8dip" |