diff options
| author | Winson Chung <winsonc@google.com> | 2015-03-11 01:36:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-11 01:36:55 +0000 |
| commit | 03f03bee25648f78cbf0d4aee1f548e46f2bb3b8 (patch) | |
| tree | f071f3cd665b06b868ef70fce74abdd69bdf8e1d /res/values/attrs.xml | |
| parent | e43083b9c6af02a29a834842c3fe681cb3f34104 (diff) | |
| parent | fc52a8fb0312393e0a729764fbe57c43839e4c0f (diff) | |
| download | android_packages_apps_Trebuchet-03f03bee25648f78cbf0d4aee1f548e46f2bb3b8.tar.gz android_packages_apps_Trebuchet-03f03bee25648f78cbf0d4aee1f548e46f2bb3b8.tar.bz2 android_packages_apps_Trebuchet-03f03bee25648f78cbf0d4aee1f548e46f2bb3b8.zip | |
am fc52a8fb: Merge "Initial changes to break out AllApps into its own view." into ub-launcher3-burnaby
* commit 'fc52a8fb0312393e0a729764fbe57c43839e4c0f':
Initial changes to break out AllApps into its own view.
Diffstat (limited to 'res/values/attrs.xml')
| -rw-r--r-- | res/values/attrs.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 3331cdec4..4e7c59280 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -18,6 +18,14 @@ <resources> + <!-- BubbleTextView specific attributes. --> + <declare-styleable name="BubbleTextView"> + <attr name="layoutHorizontal" format="boolean" /> + <attr name="iconSizeOverride" format="dimension" /> + <attr name="iconPaddingOverride" format="dimension" /> + <attr name="textSizeOverride" format="dimension" /> + </declare-styleable> + <!-- Page Indicator specific attributes. --> <declare-styleable name="PageIndicator"> <attr name="windowSize" format="integer" /> |