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

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

Merge "Keyguard: Distinguish the TextView id of pinEntry"

parents fce01875 0ddd0d8b

packages/Keyguard/res/layout/keyguard_sim_pin_view.xml

+12 −11
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ 
           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 +97,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 +106,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 +115,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 +131,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 +140,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 +149,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 +165,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 +174,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 +183,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 +204,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/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/pinEntry"

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

               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/pinEntry"

               androidprv:textView="@+id/simPinEntry"

               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/pinEntry"

               androidprv:textView="@+id/simPinEntry"

               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/pinEntry"

               androidprv:textView="@+id/simPinEntry"

               androidprv:digit="3"

               />

       </LinearLayout>
@@ -132,7 +132,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"
@@ -141,7 +141,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"
@@ -150,7 +150,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>
@@ -166,7 +166,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"
@@ -175,7 +175,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"
@@ -184,7 +184,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>
@@ -210,7 +210,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/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.pinEntry;

        return R.id.simPinEntry;

    }



    @Override