diff options
| author | Jim Miller <jaggies@google.com> | 2012-10-16 17:27:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-16 17:28:08 -0700 |
| commit | 48994ce9451cccb9ee6a6a27c18dbaaddffca452 (patch) | |
| tree | 9e31294fb04e92b7028a637186adcc9381d1dc1a /core | |
| parent | de5c3a04517bba3adacd8c6eb2b365cf93c73a69 (diff) | |
| parent | bdffd5c3a18e67443ebbd16d4f0349d0728285b1 (diff) | |
| download | frameworks_base-48994ce9451cccb9ee6a6a27c18dbaaddffca452.zip frameworks_base-48994ce9451cccb9ee6a6a27c18dbaaddffca452.tar.gz frameworks_base-48994ce9451cccb9ee6a6a27c18dbaaddffca452.tar.bz2 | |
Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/layout-port/keyguard_host_view.xml | 3 | ||||
| -rw-r--r-- | core/res/res/layout-port/keyguard_status_area.xml | 4 | ||||
| -rw-r--r-- | core/res/res/layout-sw600dp-port/keyguard_status_area.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/default_navigation.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_password_view.xml | 1 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_sim_pin_view.xml | 1 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_sim_puk_view.xml | 1 |
7 files changed, 11 insertions, 3 deletions
diff --git a/core/res/res/layout-port/keyguard_host_view.xml b/core/res/res/layout-port/keyguard_host_view.xml index 20726d0..981fe6d 100644 --- a/core/res/res/layout-port/keyguard_host_view.xml +++ b/core/res/res/layout-port/keyguard_host_view.xml @@ -33,7 +33,8 @@ <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper android:id="@+id/view_flipper" - android:layout_height="0dp" + android:layout_width="match_parent" + android:layout_height="0dip" android:clipChildren="false" android:clipToPadding="false" android:layout_weight="1" diff --git a/core/res/res/layout-port/keyguard_status_area.xml b/core/res/res/layout-port/keyguard_status_area.xml index e0a49dc..c1f6aab 100644 --- a/core/res/res/layout-port/keyguard_status_area.xml +++ b/core/res/res/layout-port/keyguard_status_area.xml @@ -45,6 +45,8 @@ <TextView android:id="@+id/alarm_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginEnd="@dimen/kg_status_line_font_right_margin" android:singleLine="true" android:ellipsize="marquee" @@ -93,4 +95,4 @@ android:textSize="@dimen/kg_status_line_font_size" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> 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 f21254a..405ac14 100644 --- a/core/res/res/layout-sw600dp-port/keyguard_status_area.xml +++ b/core/res/res/layout-sw600dp-port/keyguard_status_area.xml @@ -78,4 +78,4 @@ android:textAppearance="?android:attr/textAppearance" android:textSize="@dimen/kg_status_line_font_size" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/core/res/res/layout/default_navigation.xml b/core/res/res/layout/default_navigation.xml index b13103c..b216ded 100644 --- a/core/res/res/layout/default_navigation.xml +++ b/core/res/res/layout/default_navigation.xml @@ -18,6 +18,8 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/keyguard_click_area" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:gravity="center"> <!-- message area for security screen --> diff --git a/core/res/res/layout/keyguard_password_view.xml b/core/res/res/layout/keyguard_password_view.xml index ab8aa85..81916f7 100644 --- a/core/res/res/layout/keyguard_password_view.xml +++ b/core/res/res/layout/keyguard_password_view.xml @@ -53,6 +53,7 @@ since the backspace/IME switcher looks better inside --> <LinearLayout android:layout_gravity="center_vertical|fill_horizontal" + android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="horizontal" android:background="#70000000" diff --git a/core/res/res/layout/keyguard_sim_pin_view.xml b/core/res/res/layout/keyguard_sim_pin_view.xml index 163dc15..ae59d1d 100644 --- a/core/res/res/layout/keyguard_sim_pin_view.xml +++ b/core/res/res/layout/keyguard_sim_pin_view.xml @@ -91,6 +91,7 @@ <!-- Numeric keyboard --> <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard" android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_marginStart="4dip" android:layout_marginEnd="4dip" android:paddingTop="4dip" diff --git a/core/res/res/layout/keyguard_sim_puk_view.xml b/core/res/res/layout/keyguard_sim_puk_view.xml index 6e45b0b..414806f 100644 --- a/core/res/res/layout/keyguard_sim_puk_view.xml +++ b/core/res/res/layout/keyguard_sim_puk_view.xml @@ -93,6 +93,7 @@ <!-- Numeric keyboard --> <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard" android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_marginStart="4dip" android:layout_marginEnd="4dip" android:paddingTop="4dip" |