diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-23 10:42:29 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-23 10:43:02 -0800 |
| commit | e1bd986d77afc9426e320b7cce53993086f9d8ba (patch) | |
| tree | 33404b6b1380ef2c287b2ce31242da6e46fe0caf /res/values/attrs.xml | |
| parent | b62fd0957607ae54c7bca7ce64eed288a11f0f2f (diff) | |
| download | android_packages_apps_Trebuchet-e1bd986d77afc9426e320b7cce53993086f9d8ba.tar.gz android_packages_apps_Trebuchet-e1bd986d77afc9426e320b7cce53993086f9d8ba.tar.bz2 android_packages_apps_Trebuchet-e1bd986d77afc9426e320b7cce53993086f9d8ba.zip | |
Disabling som attributes so that dependencies can use compat libraries
Bug: 27101533
Change-Id: I18de77cffbbb234f25fb85dfe0334ed7fe113a74
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 82f33d1c0..6392123f4 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -100,8 +100,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> @@ -115,7 +119,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> |