diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-02 20:06:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 20:06:01 +0000 |
| commit | 341cff81554cb6a4f74d42c6d98890b468ed7ccf (patch) | |
| tree | b9d06c639d991a2accc02521b2e9df3186d0aada /packages/Keyguard | |
| parent | f29d07cf8276b4cd5a51fb618ee2d2ecf1879c5a (diff) | |
| parent | 774d4a6c78e7edd9a501c73ee38108d155765c75 (diff) | |
| download | frameworks_base-341cff81554cb6a4f74d42c6d98890b468ed7ccf.zip frameworks_base-341cff81554cb6a4f74d42c6d98890b468ed7ccf.tar.gz frameworks_base-341cff81554cb6a4f74d42c6d98890b468ed7ccf.tar.bz2 | |
am 61700e82: Merge "Fix padding for SIM pin entry."
* commit '61700e8200781b89eb99747c52c7661d70be2bd2':
Fix padding for SIM pin entry.
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_sim_pin_view.xml | 22 | ||||
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_sim_puk_view.xml | 22 | ||||
| -rw-r--r-- | packages/Keyguard/res/values/styles.xml | 4 |
3 files changed, 26 insertions, 22 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml b/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml index 0e2b33a..e167817 100644 --- a/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml +++ b/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml @@ -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" diff --git a/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml b/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml index 88049a7..ac798ca 100644 --- a/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml +++ b/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml @@ -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" diff --git a/packages/Keyguard/res/values/styles.xml b/packages/Keyguard/res/values/styles.xml index b54ac50..5ab00d2 100644 --- a/packages/Keyguard/res/values/styles.xml +++ b/packages/Keyguard/res/values/styles.xml @@ -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> |