diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-22 20:48:36 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-22 20:48:36 +0000 |
commit | 494552349aefe18dd3dea0dd656d5cd48f813e64 (patch) | |
tree | 5999cb62049453a685260d636bade06d591df5f8 /java/com/android/dialer/dialpadview/res/values | |
parent | b3772ecffe9901d9a55c3f3284cc652057b43f8b (diff) | |
parent | 9c9175fc3cf874d7b1e8f6334b8ba709a9e3a310 (diff) |
Merge "Show IMEI/MEID in hex, dec, and barcode when appropriate"
Diffstat (limited to 'java/com/android/dialer/dialpadview/res/values')
3 files changed, 13 insertions, 0 deletions
diff --git a/java/com/android/dialer/dialpadview/res/values/dimens.xml b/java/com/android/dialer/dialpadview/res/values/dimens.xml index 4b386eeb5..6892fcf30 100644 --- a/java/com/android/dialer/dialpadview/res/values/dimens.xml +++ b/java/com/android/dialer/dialpadview/res/values/dimens.xml @@ -43,4 +43,6 @@ <!-- Length of dialpad's shadows in dialer. --> <dimen name="shadow_length">10dp</dimen> + + <dimen name="barcode_height">100dp</dimen> </resources> diff --git a/java/com/android/dialer/dialpadview/res/values/strings.xml b/java/com/android/dialer/dialpadview/res/values/strings.xml index 094ca6b8f..51367b644 100644 --- a/java/com/android/dialer/dialpadview/res/values/strings.xml +++ b/java/com/android/dialer/dialpadview/res/values/strings.xml @@ -77,6 +77,12 @@ <!-- The title of a dialog that displays the MEID of the CDMA phone --> <string name="meid">MEID</string> + <!-- The label for the hex encoding of the device ID --> + <string name="hex" translatable="false">HEX:</string> + + <!-- The label for the decimal encoding of the device ID --> + <string name="dec" translatable="false">DEC:</string> + <!-- Dialog text displayed when loading a phone number from the SIM card for speed dial --> <string name="simContacts_emptyLoading">Loading from SIM card\u2026</string> diff --git a/java/com/android/dialer/dialpadview/res/values/styles.xml b/java/com/android/dialer/dialpadview/res/values/styles.xml index d69e6a832..75a54a305 100644 --- a/java/com/android/dialer/dialpadview/res/values/styles.xml +++ b/java/com/android/dialer/dialpadview/res/values/styles.xml @@ -116,4 +116,9 @@ <item name="dialpad_voicemail_tint">?attr/dialpad_text_color_secondary</item> <item name="dialpad_background">#00000000</item> </style> + + <style name="DeviceIdBody"> + <item name="android:textColor">?android:textColorPrimary</item> + <item name="android:textSize">16sp</item> + </style> </resources> |