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

Commit 715bb7e9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Keyguard: Can't enter PIN code when setting the SIM and PIN lock issue"

parents ebf33421 e8ac7600

packages/Keyguard/res/layout/keyguard_sim_pin_view.xml

+11 −12
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ 
           android:orientation="horizontal"

           android:layout_weight="1"

           >



           <TextView android:id="@+id/simPinEntry"

           <TextView android:id="@+id/pinEntry"

               android:editable="true"

               android:layout_width="0dip"

               android:layout_height="match_parent"
@@ -97,7 +96,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="1"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -106,7 +105,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="2"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -115,7 +114,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="3"

               />

       </LinearLayout>
@@ -131,7 +130,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="4"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -140,7 +139,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="5"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -149,7 +148,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="6"

               />

       </LinearLayout>
@@ -165,7 +164,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="7"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -174,7 +173,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="8"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -183,7 +182,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="9"

               />

       </LinearLayout>
@@ -204,7 +203,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="0"

               />

           <ImageButton

packages/Keyguard/res/layout/msim_keyguard_sim_pin_view.xml

+11 −11
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
           android:orientation="horizontal"

           android:layout_weight="1"

           >

           <TextView android:id="@+id/simPinEntry"

           <TextView android:id="@+id/pinEntry"

               android:editable="true"

               android:layout_width="0dip"

               android:layout_height="match_parent"
@@ -98,7 +98,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="1"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -107,7 +107,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="2"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -116,7 +116,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="3"

               />

       </LinearLayout>
@@ -132,7 +132,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="4"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -141,7 +141,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="5"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -150,7 +150,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="6"

               />

       </LinearLayout>
@@ -166,7 +166,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="7"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -175,7 +175,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="8"

               />

           <view class="com.android.keyguard.NumPadKey"
@@ -184,7 +184,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="9"

               />

       </LinearLayout>
@@ -210,7 +210,7 @@ 
               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

               androidprv:textView="@+id/simPinEntry"

               androidprv:textView="@+id/pinEntry"

               androidprv:digit="0"

               />

           <ImageButton

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

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


    @Override

    protected int getPasswordTextViewId() {

        return R.id.simPinEntry;

        return R.id.pinEntry;

    }



    @Override

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

+1 −2
Original line number Diff line number Diff line
@@ -1208,8 +1208,7 @@ public class KeyguardUpdateMonitor { 


    public void reportSimUnlocked(int subscription) {

        if (DEBUG) Log.d(TAG, "reportSimUnlocked(" + subscription + ")");

        mSimState[subscription] = IccCardConstants.State.READY;

        handleSimStateChange(new SimArgs(mSimState[subscription], subscription));

        handleSimStateChange(new SimArgs(IccCardConstants.State.READY, subscription));

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ public class KeyguardViewMediator { 
                    break;

                case READY:

                    synchronized (this) {

                        if (isShowing() && !isSecure()) {

                        if (isShowing()) {

                            resetStateLocked(null);

                        }

                    }