Fix missing layout parameters in keyguard.
This addresses crashes caused by an upcoming change to crash when missing layout_width and layout_height attributes are missing. Change-Id: I71044b4623d04cab41f4aee6a7a5c01b67b0d2a5
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
</LinearLayout>
|
||||
|
||||
@@ -78,4 +78,4 @@
|
||||
android:textAppearance="?android:attr/textAppearance"
|
||||
android:textSize="@dimen/kg_status_line_font_size"
|
||||
/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
@@ -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 -->
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -611,6 +611,7 @@ public class KeyguardHostView extends KeyguardViewBase {
|
||||
int layoutId = getLayoutIdFor(securityMode);
|
||||
if (view == null && layoutId != 0) {
|
||||
final LayoutInflater inflater = LayoutInflater.from(mContext);
|
||||
if (DEBUG) Log.v(TAG, "inflating id = " + layoutId);
|
||||
View v = inflater.inflate(layoutId, this, false);
|
||||
mSecurityViewContainer.addView(v);
|
||||
updateSecurityView(v);
|
||||
|
||||
Reference in New Issue
Block a user