diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-24 00:27:08 +0000 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-24 00:28:02 +0000 |
| commit | 59871ef875810d646475aab4ad5856513d7e57b9 (patch) | |
| tree | a63d0f0d8b52a15e1cde444d7e94e5a8c86953e1 /res/values | |
| parent | e1bd986d77afc9426e320b7cce53993086f9d8ba (diff) | |
| download | android_packages_apps_Trebuchet-59871ef875810d646475aab4ad5856513d7e57b9.tar.gz android_packages_apps_Trebuchet-59871ef875810d646475aab4ad5856513d7e57b9.tar.bz2 android_packages_apps_Trebuchet-59871ef875810d646475aab4ad5856513d7e57b9.zip | |
Revert "Disabling som attributes so that dependencies can use compat libraries"
This reverts commit e1bd986d77afc9426e320b7cce53993086f9d8ba.
Change-Id: I27490d0cb241b2e58ce45998f7f9e9bc8d84993c
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 6392123f4..82f33d1c0 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -100,12 +100,8 @@ <attr name="y" format="string" /> <attr name="spanX" format="string" /> <attr name="spanY" format="string" /> - <!-- - Temporarily disabling attr format definitions to prevent conflicts with support libs. - Re-enable it once AAPT starts supporting multiple definitions of same attr. <attr name="icon" format="reference" /> <attr name="title" format="reference" /> - --> <attr name="uri" format="string" /> </declare-styleable> @@ -119,7 +115,7 @@ </declare-styleable> <declare-styleable name="PreloadIconDrawable"> - <attr name="ringBackground" format="reference" /> + <attr name="background" format="reference" /> <attr name="ringOutset" format="dimension" /> <attr name="indicatorSize" format="dimension" /> </declare-styleable> diff --git a/res/values/styles.xml b/res/values/styles.xml index 2b13159d7..4eee13099 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -84,13 +84,13 @@ <style name="DropTargetButton" parent="DropTargetButtonBase" /> <style name="PreloadIcon"> - <item name="ringBackground">@drawable/virtual_preload</item> + <item name="background">@drawable/virtual_preload</item> <item name="indicatorSize">4dp</item> <item name="ringOutset">4dp</item> </style> <style name="PreloadIcon.Folder"> - <item name="ringBackground">@drawable/virtual_preload_folder</item> + <item name="background">@drawable/virtual_preload_folder</item> <item name="indicatorSize">4dp</item> <item name="ringOutset">4dp</item> </style> |