commit 10451a967f65c577010d359e1226fd0b5897dbe6
author Sunny Goyal <sunnygoyal@google.com> Mon Mar 23 19:17:10 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 23 19:17:11 2015 +0000
tree c0c43813fd720acd361d515566fea0a69b7d9834
parent 2670980ab7e5c575e3beef3f220331256fd66c3e
parent 1d0b093a6e384f5ade340c2b404b324bb6002c97

Merge "Adding BaseActivity which can be overriden for custom behavior" into ub-launcher3-burnaby

res/values/attrs.xml

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 845b182..a1f2845 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">