Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b91dfd95 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

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

parents f805b40c fa9189fd

packages/Keyguard/res/layout/keyguard_sim_pin_view.xml

+11 −11
Original line number Diff line number Diff line
@@ -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

packages/Keyguard/res/layout/keyguard_sim_puk_view.xml

+11 −11
Original line number Diff line number Diff line
@@ -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

packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class KeyguardSimPinView extends KeyguardAbsKeyInputView 


    @Override

    protected int getPasswordTextViewId() {

        return R.id.pinEntry;

        return R.id.simPinEntry;

    }



    @Override

packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class KeyguardSimPukView extends KeyguardAbsKeyInputView 


    @Override

    protected int getPasswordTextViewId() {

        return R.id.pinEntry;

        return R.id.pukEntry;

    }



    @Override