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

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

Merge "Fix padding for SIM pin entry."

parents 9acfb48f 412cc704

packages/Keyguard/res/layout/keyguard_sim_pin_view.xml

+11 −11
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
           >

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key1"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -101,7 +101,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key2"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -110,7 +110,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key3"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -126,7 +126,7 @@ 
           >

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key4"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -135,7 +135,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key5"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -144,7 +144,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key6"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -160,7 +160,7 @@ 
           >

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key7"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -169,7 +169,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key8"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -178,7 +178,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key9"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -199,7 +199,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key0"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -208,7 +208,7 @@ 
               />

           <ImageButton

               android:id="@+id/key_enter"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

packages/Keyguard/res/layout/keyguard_sim_puk_view.xml

+11 −11
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
           >

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key1"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -102,7 +102,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key2"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -111,7 +111,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key3"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -127,7 +127,7 @@ 
           >

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key4"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -136,7 +136,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key5"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -145,7 +145,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key6"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -161,7 +161,7 @@ 
           >

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key7"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -170,7 +170,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key8"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -179,7 +179,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key9"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -200,7 +200,7 @@ 
               />

           <view class="com.android.keyguard.NumPadKey"

               android:id="@+id/key0"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"
@@ -209,7 +209,7 @@ 
               />

           <ImageButton

               android:id="@+id/key_enter"

               style="@style/Widget.Button.NumPadKey"

               style="@style/Widget.Button.NumPadKey.Sim"

               android:layout_width="0px"

               android:layout_height="match_parent"

               android:layout_weight="1"

packages/Keyguard/res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ 
        <item name="android:paddingLeft">20dp</item>

        <item name="android:paddingRight">6dp</item>

    </style>

    <style name="Widget.Button.NumPadKey.Sim" >

        <item name="android:paddingTop">3dp</item>

        <item name="android:paddingBottom">4dp</item>

    </style>

    <style name="TextAppearance.NumPadKey"

            parent="@android:style/TextAppearance">

        <item name="android:textSize">34dp</item>