diff options
| author | Adam Cohen <adamcohen@google.com> | 2015-03-21 17:07:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-21 17:07:52 +0000 |
| commit | e38ba101d1c98d1fb08d446e0c3ec041578152c8 (patch) | |
| tree | efc6928d31f676f0985bb273097dc75c918bf51f | |
| parent | 00a44cbb2e871e6c694272c1d7ee5e90334e177a (diff) | |
| parent | 2670980ab7e5c575e3beef3f220331256fd66c3e (diff) | |
| download | android_packages_apps_Trebuchet-e38ba101d1c98d1fb08d446e0c3ec041578152c8.tar.gz android_packages_apps_Trebuchet-e38ba101d1c98d1fb08d446e0c3ec041578152c8.tar.bz2 android_packages_apps_Trebuchet-e38ba101d1c98d1fb08d446e0c3ec041578152c8.zip | |
am 2670980a: Remove dublicate BubbleTextView styleable
* commit '2670980ab7e5c575e3beef3f220331256fd66c3e':
Remove dublicate BubbleTextView styleable
| -rw-r--r-- | res/values/attrs.xml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 845b18230..a1f28452a 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -25,6 +25,7 @@ <attr name="iconPaddingOverride" format="dimension" /> <attr name="textSizeOverride" format="dimension" /> <attr name="deferShadowGeneration" format="boolean" /> + <attr name="customShadows" format="boolean" /> </declare-styleable> <!-- Page Indicator specific attributes. --> @@ -89,11 +90,6 @@ <attr name="pageIndicator" format="reference" /> </declare-styleable> - <declare-styleable name="BubbleTextView"> - <!-- A spacing override for the icons within a page --> - <attr name="customShadows" format="boolean" /> - </declare-styleable> - <!-- AppsCustomizePagedView specific attributes. These attributes are used to customize an AppsCustomizePagedView in xml files. --> <declare-styleable name="AppsCustomizePagedView"> |