diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-15 18:43:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-15 18:43:12 -0700 |
| commit | dec26f2011a136868aebf50646b3cf3d27080008 (patch) | |
| tree | 2f0e525423cb25da35fc9362f0d38af0dd5ab51c | |
| parent | 0e082155ef2d7390d7befc139a788d3def94fecc (diff) | |
| parent | 42b0c70a31a61436fb3a104c7cf498b12ba8d4b6 (diff) | |
| download | frameworks_base-dec26f2011a136868aebf50646b3cf3d27080008.zip frameworks_base-dec26f2011a136868aebf50646b3cf3d27080008.tar.gz frameworks_base-dec26f2011a136868aebf50646b3cf3d27080008.tar.bz2 | |
Merge "Add missing layout_width/height Bug #7334849" into jb-mr1-dev
| -rw-r--r-- | core/res/res/layout-land/keyguard_status_area.xml | 8 | ||||
| -rw-r--r-- | core/res/res/layout-port/keyguard_status_area.xml | 6 | ||||
| -rw-r--r-- | core/res/res/layout-sw600dp-port/keyguard_status_area.xml | 6 |
3 files changed, 20 insertions, 0 deletions
diff --git a/core/res/res/layout-land/keyguard_status_area.xml b/core/res/res/layout-land/keyguard_status_area.xml index 78bf931..f562d9f 100644 --- a/core/res/res/layout-land/keyguard_status_area.xml +++ b/core/res/res/layout-land/keyguard_status_area.xml @@ -41,6 +41,8 @@ <TextView android:id="@+id/alarm_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginTop="28dp" android:layout_marginEnd="@dimen/kg_status_line_font_right_margin" @@ -53,6 +55,8 @@ <TextView android:id="@+id/owner_info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginTop="4dp" android:layout_marginEnd="@dimen/kg_status_line_font_right_margin" @@ -64,6 +68,8 @@ <TextView android:id="@+id/status1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginTop="4dp" android:layout_marginEnd="@dimen/kg_status_line_font_right_margin" @@ -75,6 +81,8 @@ <TextView android:id="@+id/status_security_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="right" android:layout_marginTop="12dp" diff --git a/core/res/res/layout-port/keyguard_status_area.xml b/core/res/res/layout-port/keyguard_status_area.xml index 00aac7b..e0a49dc 100644 --- a/core/res/res/layout-port/keyguard_status_area.xml +++ b/core/res/res/layout-port/keyguard_status_area.xml @@ -56,6 +56,8 @@ <TextView android:id="@+id/owner_info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="right" android:layout_marginTop="4dp" android:layout_marginEnd="@dimen/kg_status_line_font_right_margin" @@ -67,6 +69,8 @@ <TextView android:id="@+id/status1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="right" android:layout_marginTop="4dp" android:layout_marginEnd="@dimen/kg_status_line_font_right_margin" @@ -78,6 +82,8 @@ <TextView android:id="@+id/status_security_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="right" android:layout_marginTop="4dp" android:layout_marginEnd="@dimen/kg_status_line_font_right_margin" diff --git a/core/res/res/layout-sw600dp-port/keyguard_status_area.xml b/core/res/res/layout-sw600dp-port/keyguard_status_area.xml index 679aebd..f21254a 100644 --- a/core/res/res/layout-sw600dp-port/keyguard_status_area.xml +++ b/core/res/res/layout-sw600dp-port/keyguard_status_area.xml @@ -41,6 +41,8 @@ <TextView android:id="@+id/alarm_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginTop="28dp" android:layout_marginEnd="@dimen/kg_status_line_font_right_margin" @@ -53,6 +55,8 @@ <TextView android:id="@+id/owner_info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginTop="4dp" android:layout_marginEnd="@dimen/kg_status_line_font_right_margin" @@ -64,6 +68,8 @@ <TextView android:id="@+id/status1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginTop="4dp" android:layout_marginEnd="@dimen/kg_status_line_font_right_margin" |