Merge "Revert "Disabling som attributes so that dependencies can use compat libraries"" into ub-launcher3-burnaby-polish
am: 81131edc8e
* commit '81131edc8ed9c1d866d98bef3f08bbd9eb4d47fc':
Revert "Disabling som attributes so that dependencies can use compat libraries"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 06454aa..34d86df 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -60,12 +60,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>
@@ -79,7 +75,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 92ec874..92cbe04 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -98,13 +98,13 @@
<!-- Virtual preloaders -->
<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>
diff --git a/src/com/android/launcher3/PreloadIconDrawable.java b/src/com/android/launcher3/PreloadIconDrawable.java
index a9acf08..b064c47 100644
--- a/src/com/android/launcher3/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/PreloadIconDrawable.java
@@ -60,7 +60,7 @@
public void applyPreloaderTheme(Theme t) {
TypedArray ta = t.obtainStyledAttributes(R.styleable.PreloadIconDrawable);
- mBgDrawable = ta.getDrawable(R.styleable.PreloadIconDrawable_ringBackground);
+ mBgDrawable = ta.getDrawable(R.styleable.PreloadIconDrawable_background);
mBgDrawable.setFilterBitmap(true);
mPaint.setStrokeWidth(ta.getDimension(R.styleable.PreloadIconDrawable_indicatorSize, 0));
mRingOutset = ta.getDimensionPixelSize(R.styleable.PreloadIconDrawable_ringOutset, 0);