am 1ed143ea: Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev (7b4386c6) · Commits · e / os / android_frameworks_base

core/res/res/layout/keyguard_navigation.xml

+1 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		**
		** Copyright 2008, The Android Open Source Project
		** Copyright 2012, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License")
		** you may not use this file except in compliance with the License.

core/res/res/layout/keyguard_password_view.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,10 +67,10 @@
		<ImageButton android:id="@+id/delete_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:src="@*android:drawable/ic_input_delete"
		android:clickable="true"
		android:padding="8dip"
		android:layout_gravity="center_vertical"
		android:background="?android:attr/selectableItemBackground"
		android:visibility="gone"
		/>

core/res/res/layout/keyguard_sim_pin_view.xml

+14 −7

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@
		android:layout_marginEnd="4dip"
		android:layout_marginStart="4dip"
		android:gravity="center_vertical"
		android:background="@android:drawable/edit_text">
		android:background="#70000000">

		<!-- displays dots as user enters pin -->
		<EditText android:id="@+id/sim_pin_entry"
		@@ -60,19 +60,26 @@
		android:layout_weight="1"
		android:maxLines="1"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceLargeInverse"
		android:textColor="@*android:color/primary_text_holo_light"
		android:textStyle="bold"
		android:gravity="center_horizontal"
		android:layout_gravity="center_vertical"
		android:layout_marginStart="@*android:dimen/keyguard_lockscreen_pin_margin_left"
		android:textStyle="normal"
		android:inputType="textPassword"
		android:textSize="36sp"
		android:background="@null"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textColor="#ffffffff"
		android:imeOptions="flagForceAscii\|actionDone"
		/>

		<ImageButton android:id="@+id/delete_button"
		android:src="@android:drawable/ic_input_delete"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="-3dip"
		android:layout_marginBottom="-3dip"
		android:layout_gravity="center_vertical"
		android:src="@android:drawable/ic_input_delete"
		android:clickable="true"
		android:padding="8dip"
		android:background="?android:attr/selectableItemBackground"
		/>
		</LinearLayout>

core/res/res/layout/keyguard_sim_puk_view.xml

+58 −87

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@
		** limitations under the License.
		*/
		-->
		<!-- This is the SIM PUK view that allows the user to recover their device by entering the
		carrier-provided PUK code and entering a new SIM PIN for it. -->
		<com.android.internal.policy.impl.keyguard.KeyguardSimPukView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/keyguard_sim_puk_view"
		@@ -24,100 +26,64 @@
		android:orientation="vertical"
		android:gravity="center_horizontal">

		<include layout="@layout/keyguard_navigation"/>

		<Space
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1"/>

		<LinearLayout android:id="@+id/topDisplayGroup"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<LinearLayout
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="wrap_content"
		android:layout_weight="1"
		android:layout_height="match_parent"
		android:paddingEnd="0dip"
		android:layout_marginEnd="10dip"
		android:layout_marginStart="10dip">

		<LinearLayout
		android:layout_height="0dip"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_marginEnd="6dip"
		android:layout_marginStart="6dip"
		android:gravity="center_vertical"
		android:background="@*android:drawable/edit_text">

		<!-- displays dots as user enters puk -->
		<EditText android:id="@+id/sim_puk_entry"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:maxLines="1"
		android:textStyle="bold"
		android:inputType="textPassword"
		android:textColor="#000"
		android:hint="@string/kg_puk_enter_puk_hint"
		/>
		android:orientation="vertical"
		android:gravity="center">

		<ImageButton android:id="@+id/puk_delete_button"
		android:src="@*android:drawable/ic_input_delete"
		<ImageView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="-3dip"
		android:layout_marginBottom="-3dip"
		/>
		android:src="@drawable/ic_lockscreen_sim"/>

		</LinearLayout>
		<include layout="@layout/keyguard_navigation"/>

		</LinearLayout>

		<!-- Password entry field -->
		<!-- Note: the entire container is styled to look like the edit field,
		since the backspace/IME switcher looks better inside -->
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_marginEnd="6dip"
		android:layout_marginStart="6dip"
		android:layout_marginEnd="4dip"
		android:layout_marginStart="4dip"
		android:gravity="center_vertical"
		android:background="@*android:drawable/edit_text">
		android:background="#70000000">

		<!-- displays dots as user enters new pin -->
		<!-- displays dots as user enters pin -->
		<EditText android:id="@+id/sim_pin_entry"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:maxLines="1"
		android:textStyle="bold"
		android:singleLine="true"
		android:gravity="center_horizontal"
		android:layout_gravity="center_vertical"
		android:layout_marginStart="@*android:dimen/keyguard_lockscreen_pin_margin_left"
		android:textStyle="normal"
		android:inputType="textPassword"
		android:textColor="#000"
		android:hint="@string/kg_puk_enter_pin_hint"
		android:textSize="36sp"
		android:background="@null"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textColor="#ffffffff"
		android:imeOptions="flagForceAscii\|actionDone"
		/>

		<ImageButton android:id="@+id/pin_delete_button"
		android:src="@*android:drawable/ic_input_delete"
		<ImageButton android:id="@+id/delete_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="-3dip"
		android:layout_marginBottom="-3dip"
		android:layout_gravity="center_vertical"
		android:src="@android:drawable/ic_input_delete"
		android:clickable="true"
		android:padding="8dip"
		android:background="?android:attr/selectableItemBackground"
		/>
		</LinearLayout>

		</LinearLayout>

		</LinearLayout>

		</LinearLayout>

		<!-- Numeric keyboard -->
		<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
		android:layout_width="match_parent"
		@@ -125,9 +91,14 @@
		android:layout_marginEnd="4dip"
		android:paddingTop="4dip"
		android:paddingBottom="4dip"
		android:background="#80ffffff"
		android:background="#40000000"
		android:keyBackground="@*android:drawable/btn_keyboard_key_ics"
		android:clickable="true"
		/>

		<Space
		android:layout_width="match_parent"
		android:layout_height="@dimen/kg_secure_padding_height"
		android:background="@drawable/lockscreen_protection_pattern" />

		</com.android.internal.policy.impl.keyguard.KeyguardSimPukView>

core/res/res/values/strings.xml

+10 −8

Original line number	Diff line number	Diff line
		@@ -3833,10 +3833,12 @@
		<string name="kg_pin_instructions">Enter PIN</string>
		<!-- Instructions for using the password unlock screen -->
		<string name="kg_password_instructions">Enter Password</string>
		<!-- Hint shown in the PUK unlock screen PUK TextView -->
		<string name="kg_puk_enter_puk_hint">PUK code</string>
		<!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
		<string name="kg_puk_enter_puk_hint">SIM is now disabled. Enter PUK code to continue. Contact carrier for details.</string>
		<!-- Hint shown in the PUK unlock screen PIN TextView -->
		<string name="kg_puk_enter_pin_hint">New PIN code</string>
		<string name="kg_puk_enter_pin_hint">Enter desired PIN code</string>
		<!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
		<string name="kg_enter_confirm_pin_hint">Confirm desired PIN code</string>
		<!-- Message shown in dialog while the device is unlocking the SIM card -->
		<string name="kg_sim_unlock_progress_dialog_message">Unlocking SIM card\u2026</string>
		<!-- Message shown when the user enters the wrong PIN code -->
		@@ -3844,11 +3846,11 @@
		<!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
		<string name="kg_invalid_sim_pin_hint">Type a PIN that is 4 to 8 numbers.</string>
		<!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
		<string name="kg_invalid_sim_puk_hint">Type a PUK that is 8 numbers or longer.</string>
		<!-- Instructions for PUK unlock screen -->
		<string name="kg_sim_puk_recovery_hint">Type PUK and new PIN code</string>
		<string name="kg_invalid_sim_puk_hint">PUK code should be 8 numbers or more.</string>
		<!-- Message shown when the user enters an invalid PUK code -->
		<string name="kg_invalid_puk">The PUK you typed isn\'t correct.</string>
		<string name="kg_invalid_puk">Re-enter the correct PUK code. Repeated attempts will permanently disable the SIM.</string>
		<!-- String shown in PUK screen when PIN codes don't match -->
		<string name="kg_invalid_confirm_pin_hint" product="default">PIN codes does not match</string>
		<!-- Message shown when the user exceeds the maximum number of pattern attempts -->
		<string name="kg_login_too_many_attempts">Too many pattern attempts</string>
		<!-- Instructions show in account unlock screen allowing user to enter their email password -->
		@@ -3864,7 +3866,7 @@
		<!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
		<string name="kg_login_account_recovery_hint">Forgot your username or password\?\nVisit <b>google.com/accounts/recovery</b>.</string>
		<!-- Message shown while device checks username/password in account unlock screen of keyguard -->
		<string name="kg_login_checking_password">Checking\u2026</string>
		<string name="kg_login_checking_password">Unlocking SIM\u2026</string>
		<!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
		<string name="kg_too_many_failed_pin_attempts_dialog_message">
		You have incorrectly typed your PIN <xliff:g id="number">%d</xliff:g> times.