diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-17 18:29:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-17 18:29:48 +0000 |
| commit | d838997209f7c279f6d50b8b8a32c44cb174d330 (patch) | |
| tree | d9e25202b136a70dbf59ec634db5f14f4cbfdfdc /packages/Keyguard | |
| parent | ae1248452a0db7fb389bba935a6605098edb2761 (diff) | |
| parent | b91dfd95b19f13be5497ea521ed14df8471b0e2e (diff) | |
| download | frameworks_base-d838997209f7c279f6d50b8b8a32c44cb174d330.zip frameworks_base-d838997209f7c279f6d50b8b8a32c44cb174d330.tar.gz frameworks_base-d838997209f7c279f6d50b8b8a32c44cb174d330.tar.bz2 | |
am b91dfd95: Merge "Fix not being able to unlock SIM PIN."
* commit 'b91dfd95b19f13be5497ea521ed14df8471b0e2e':
Fix not being able to unlock SIM PIN.
Diffstat (limited to 'packages/Keyguard')
4 files changed, 24 insertions, 24 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml b/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml index e96220e..0e2b33a 100644 --- a/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml +++ b/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml @@ -52,7 +52,7 @@ android:orientation="horizontal" android:layout_weight="1" > - <TextView android:id="@+id/pinEntry" + <TextView android:id="@+id/simPinEntry" android:editable="true" android:layout_width="0dip" android:layout_height="match_parent" @@ -96,7 +96,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/simPinEntry" androidprv:digit="1" /> <view class="com.android.keyguard.NumPadKey" @@ -105,7 +105,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/simPinEntry" androidprv:digit="2" /> <view class="com.android.keyguard.NumPadKey" @@ -114,7 +114,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/simPinEntry" androidprv:digit="3" /> </LinearLayout> @@ -130,7 +130,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/simPinEntry" androidprv:digit="4" /> <view class="com.android.keyguard.NumPadKey" @@ -139,7 +139,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/simPinEntry" androidprv:digit="5" /> <view class="com.android.keyguard.NumPadKey" @@ -148,7 +148,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/simPinEntry" androidprv:digit="6" /> </LinearLayout> @@ -164,7 +164,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/simPinEntry" androidprv:digit="7" /> <view class="com.android.keyguard.NumPadKey" @@ -173,7 +173,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/simPinEntry" androidprv:digit="8" /> <view class="com.android.keyguard.NumPadKey" @@ -182,7 +182,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/simPinEntry" androidprv:digit="9" /> </LinearLayout> @@ -203,7 +203,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/simPinEntry" androidprv:digit="0" /> <ImageButton diff --git a/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml b/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml index bf15ba0..88049a7 100644 --- a/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml +++ b/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml @@ -53,7 +53,7 @@ android:orientation="horizontal" android:layout_weight="1" > - <TextView android:id="@+id/pinEntry" + <TextView android:id="@+id/pukEntry" android:editable="true" android:layout_width="0dip" android:layout_height="match_parent" @@ -97,7 +97,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/pukEntry" androidprv:digit="1" /> <view class="com.android.keyguard.NumPadKey" @@ -106,7 +106,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/pukEntry" androidprv:digit="2" /> <view class="com.android.keyguard.NumPadKey" @@ -115,7 +115,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/pukEntry" androidprv:digit="3" /> </LinearLayout> @@ -131,7 +131,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/pukEntry" androidprv:digit="4" /> <view class="com.android.keyguard.NumPadKey" @@ -140,7 +140,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/pukEntry" androidprv:digit="5" /> <view class="com.android.keyguard.NumPadKey" @@ -149,7 +149,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/pukEntry" androidprv:digit="6" /> </LinearLayout> @@ -165,7 +165,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/pukEntry" androidprv:digit="7" /> <view class="com.android.keyguard.NumPadKey" @@ -174,7 +174,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/pukEntry" androidprv:digit="8" /> <view class="com.android.keyguard.NumPadKey" @@ -183,7 +183,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/pukEntry" androidprv:digit="9" /> </LinearLayout> @@ -204,7 +204,7 @@ android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="1" - androidprv:textView="@+id/pinEntry" + androidprv:textView="@+id/pukEntry" androidprv:digit="0" /> <ImageButton diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java index d6a4f52..4791956 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java @@ -87,7 +87,7 @@ public class KeyguardSimPinView extends KeyguardAbsKeyInputView @Override protected int getPasswordTextViewId() { - return R.id.pinEntry; + return R.id.simPinEntry; } @Override diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java index 04cbde1..b9c7f51 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java @@ -138,7 +138,7 @@ public class KeyguardSimPukView extends KeyguardAbsKeyInputView @Override protected int getPasswordTextViewId() { - return R.id.pinEntry; + return R.id.pukEntry; } @Override |