diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-23 19:02:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-23 19:02:41 +0000 |
| commit | 1a187d4e3750e335a05eb83e73afedb8b03b3e1a (patch) | |
| tree | 0f2d575a493cab39bca3c65aafb86c84606c34ef /res/values/attrs.xml | |
| parent | 261194387beebaa7927ec4e310274218b651494d (diff) | |
| parent | e1bd986d77afc9426e320b7cce53993086f9d8ba (diff) | |
| download | android_packages_apps_Trebuchet-1a187d4e3750e335a05eb83e73afedb8b03b3e1a.tar.gz android_packages_apps_Trebuchet-1a187d4e3750e335a05eb83e73afedb8b03b3e1a.tar.bz2 android_packages_apps_Trebuchet-1a187d4e3750e335a05eb83e73afedb8b03b3e1a.zip | |
Disabling som attributes so that dependencies can use compat libraries
am: e1bd986d77
* commit 'e1bd986d77afc9426e320b7cce53993086f9d8ba':
Disabling som attributes so that dependencies can use compat libraries
Diffstat (limited to 'res/values/attrs.xml')
| -rw-r--r-- | res/values/attrs.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 34d86df2d..06454aa5a 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -60,8 +60,12 @@ <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> @@ -75,7 +79,7 @@ </declare-styleable> <declare-styleable name="PreloadIconDrawable"> - <attr name="background" format="reference" /> + <attr name="ringBackground" format="reference" /> <attr name="ringOutset" format="dimension" /> <attr name="indicatorSize" format="dimension" /> </declare-styleable> |