diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-08-20 20:36:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-20 20:15:45 +0000 |
| commit | 22308ce1b858aa9a4e9068ea4fb1d47e62fc6e67 (patch) | |
| tree | b4d16b837ff1c55a64053e692a6082cd28affdf6 /res | |
| parent | 2111606845bec8b40e8eb164c73c60f59c028014 (diff) | |
| parent | 508da15509224b46fcccabbe78f3e92fe69a67d8 (diff) | |
| download | android_packages_apps_Trebuchet-22308ce1b858aa9a4e9068ea4fb1d47e62fc6e67.tar.gz android_packages_apps_Trebuchet-22308ce1b858aa9a4e9068ea4fb1d47e62fc6e67.tar.bz2 android_packages_apps_Trebuchet-22308ce1b858aa9a4e9068ea4fb1d47e62fc6e67.zip | |
Merge "Updating the icon click feedback" into ub-now-porkchop
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/apps_customize_application.xml | 4 | ||||
| -rw-r--r-- | res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
4 files changed, 3 insertions, 7 deletions
diff --git a/res/layout/apps_customize_application.xml b/res/layout/apps_customize_application.xml index 17f4a8e15..c56cdf3d2 100644 --- a/res/layout/apps_customize_application.xml +++ b/res/layout/apps_customize_application.xml @@ -14,10 +14,8 @@ limitations under the License. --> -<com.android.launcher3.PagedViewIcon +<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - style="@style/WorkspaceIcon.AppsCustomize" android:id="@+id/application_icon" android:focusable="true" /> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 552e84ca2..0db60c95c 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -106,7 +106,6 @@ <declare-styleable name="BubbleTextView"> <!-- A spacing override for the icons within a page --> <attr name="customShadows" format="boolean" /> - <attr name="glowColor" format="color" /> </declare-styleable> <!-- AppsCustomizePagedView specific attributes. These attributes are used to diff --git a/res/values/colors.xml b/res/values/colors.xml index 5e9c6ecec..8aa2184e5 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -34,7 +34,6 @@ <color name="quantum_panel_text_color">#FF666666</color> <color name="quantum_panel_text_shadow_color">#FFC4C4C4</color> - <color name="folder_items_glow_color">#FFCCCCCC</color> <color name="outline_color">#FFFFFFFF</color> <color name="widget_text_panel">#FF374248</color> diff --git a/res/values/styles.xml b/res/values/styles.xml index 6079eee3b..056930604 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -91,7 +91,8 @@ <item name="android:shadowRadius">2.0</item> <item name="android:shadowDx">0</item> <item name="android:shadowDy">2</item> - <item name="android:shadowColor">#FFC4C4C4</item> + <item name="android:shadowColor">@color/quantum_panel_text_shadow_color</item> + <item name="customShadows">false</item> </style> <style name="WorkspaceIcon.Folder"> @@ -103,7 +104,6 @@ <item name="android:shadowDy">2</item> <item name="customShadows">false</item> - <item name="glowColor">@color/folder_items_glow_color</item> </style> <style name="SearchDropTargetBar"> |