Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix not being able to unlock SIM PIN."

Browse Source
This commit is contained in:
Jorim Jaggi
2014-04-17 18:23:05 +00:00
committed by Android (Google) Code Review
parent f805b40c44 fa9189fd74
commit b91dfd95b1
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/Keyguard/res/layout/keyguard_sim_pin_view.xml
View File

@@ -52,7 +52,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_weight="1" android:layout_weight="1"
> >
<TextView android:id="@+id/pinEntry" <TextView android:id="@+id/simPinEntry"
android:editable="true" android:editable="true"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -96,7 +96,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/simPinEntry"
androidprv:digit="1" androidprv:digit="1"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -105,7 +105,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/simPinEntry"
androidprv:digit="2" androidprv:digit="2"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -114,7 +114,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/simPinEntry"
androidprv:digit="3" androidprv:digit="3"
/> />
</LinearLayout> </LinearLayout>
@@ -130,7 +130,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/simPinEntry"
androidprv:digit="4" androidprv:digit="4"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -139,7 +139,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/simPinEntry"
androidprv:digit="5" androidprv:digit="5"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -148,7 +148,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/simPinEntry"
androidprv:digit="6" androidprv:digit="6"
/> />
</LinearLayout> </LinearLayout>
@@ -164,7 +164,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/simPinEntry"
androidprv:digit="7" androidprv:digit="7"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -173,7 +173,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/simPinEntry"
androidprv:digit="8" androidprv:digit="8"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -182,7 +182,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/simPinEntry"
androidprv:digit="9" androidprv:digit="9"
/> />
</LinearLayout> </LinearLayout>
@@ -203,7 +203,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/simPinEntry"
androidprv:digit="0" androidprv:digit="0"
/> />
<ImageButton <ImageButton

22
packages/Keyguard/res/layout/keyguard_sim_puk_view.xml
View File

@@ -53,7 +53,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_weight="1" android:layout_weight="1"
> >
<TextView android:id="@+id/pinEntry" <TextView android:id="@+id/pukEntry"
android:editable="true" android:editable="true"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -97,7 +97,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/pukEntry"
androidprv:digit="1" androidprv:digit="1"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -106,7 +106,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/pukEntry"
androidprv:digit="2" androidprv:digit="2"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -115,7 +115,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/pukEntry"
androidprv:digit="3" androidprv:digit="3"
/> />
</LinearLayout> </LinearLayout>
@@ -131,7 +131,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/pukEntry"
androidprv:digit="4" androidprv:digit="4"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -140,7 +140,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/pukEntry"
androidprv:digit="5" androidprv:digit="5"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -149,7 +149,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/pukEntry"
androidprv:digit="6" androidprv:digit="6"
/> />
</LinearLayout> </LinearLayout>
@@ -165,7 +165,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/pukEntry"
androidprv:digit="7" androidprv:digit="7"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -174,7 +174,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/pukEntry"
androidprv:digit="8" androidprv:digit="8"
/> />
<view class="com.android.keyguard.NumPadKey" <view class="com.android.keyguard.NumPadKey"
@@ -183,7 +183,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/pukEntry"
androidprv:digit="9" androidprv:digit="9"
/> />
</LinearLayout> </LinearLayout>
@@ -204,7 +204,7 @@
android:layout_width="0px" android:layout_width="0px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
androidprv:textView="@+id/pinEntry" androidprv:textView="@+id/pukEntry"
androidprv:digit="0" androidprv:digit="0"
/> />
<ImageButton <ImageButton

2
packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
View File

@@ -87,7 +87,7 @@ public class KeyguardSimPinView extends KeyguardAbsKeyInputView
@Override @Override
protected int getPasswordTextViewId() { protected int getPasswordTextViewId() {
return R.id.pinEntry; return R.id.simPinEntry;
} }
@Override @Override

2
packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
View File

@@ -138,7 +138,7 @@ public class KeyguardSimPukView extends KeyguardAbsKeyInputView
@Override @Override
protected int getPasswordTextViewId() { protected int getPasswordTextViewId() {
return R.id.pinEntry; return R.id.pukEntry;
} }
@Override @Override