diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-11 23:55:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-11 23:55:12 +0000 |
| commit | 57ebefb5891255a23472473d5ec90b5247a334fc (patch) | |
| tree | 4911ca34993b6f03b8e71c3a97e86c9ab73ba449 /res/values | |
| parent | bcae8f0272f4e1c7a8736de22d96924759cbc3c6 (diff) | |
| parent | dfaccf64bd59343de483b12eee6db61c960aedce (diff) | |
| download | android_packages_apps_Trebuchet-57ebefb5891255a23472473d5ec90b5247a334fc.tar.gz android_packages_apps_Trebuchet-57ebefb5891255a23472473d5ec90b5247a334fc.tar.bz2 android_packages_apps_Trebuchet-57ebefb5891255a23472473d5ec90b5247a334fc.zip | |
Merge "Various icon size changes" into ub-launcher3-burnaby
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index a1f28452a..fee3417b0 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -22,8 +22,10 @@ <declare-styleable name="BubbleTextView"> <attr name="layoutHorizontal" format="boolean" /> <attr name="iconSizeOverride" format="dimension" /> - <attr name="iconPaddingOverride" format="dimension" /> - <attr name="textSizeOverride" format="dimension" /> + <attr name="iconDisplay" format="integer"> + <enum name="workspace" value="0" /> + <enum name="all_apps" value="1" /> + </attr> <attr name="deferShadowGeneration" format="boolean" /> <attr name="customShadows" format="boolean" /> </declare-styleable> |