commit 1a187d4e3750e335a05eb83e73afedb8b03b3e1a
author Sunny Goyal <sunnygoyal@google.com> Tue Feb 23 19:02:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 23 19:02:41 2016 +0000
tree 0f2d575a493cab39bca3c65aafb86c84606c34ef
parent 261194387beebaa7927ec4e310274218b651494d
parent e1bd986d77afc9426e320b7cce53993086f9d8ba

Disabling som attributes so that dependencies can use compat libraries
am: e1bd986d77

* commit 'e1bd986d77afc9426e320b7cce53993086f9d8ba':
  Disabling som attributes so that dependencies can use compat libraries

res/values/attrs.xml

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 34d86df..06454aa 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>

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 92cbe04..92ec874 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -98,13 +98,13 @@
 
     <!-- Virtual preloaders -->
     <style name="PreloadIcon">
-        <item name="background">@drawable/virtual_preload</item>
+        <item name="ringBackground">@drawable/virtual_preload</item>
         <item name="indicatorSize">4dp</item>
         <item name="ringOutset">4dp</item>
     </style>
 
     <style name="PreloadIcon.Folder">
-        <item name="background">@drawable/virtual_preload_folder</item>
+        <item name="ringBackground">@drawable/virtual_preload_folder</item>
         <item name="indicatorSize">4dp</item>
         <item name="ringOutset">4dp</item>
     </style>

src/com/android/launcher3/PreloadIconDrawable.java

diff --git a/src/com/android/launcher3/PreloadIconDrawable.java b/src/com/android/launcher3/PreloadIconDrawable.java
index b064c47..a9acf08 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_background);
+        mBgDrawable = ta.getDrawable(R.styleable.PreloadIconDrawable_ringBackground);
         mBgDrawable.setFilterBitmap(true);
         mPaint.setStrokeWidth(ta.getDimension(R.styleable.PreloadIconDrawable_indicatorSize, 0));
         mRingOutset = ta.getDimensionPixelSize(R.styleable.PreloadIconDrawable_ringOutset, 0);

src/com/android/launcher3/widget/WidgetsListAdapter.java

diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java
index 55a2f7a..33f2ae7 100644
--- a/src/com/android/launcher3/widget/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java
@@ -16,7 +16,9 @@
 package com.android.launcher3.widget;
 
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
 import android.os.Build;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.Adapter;
@@ -28,6 +30,7 @@
 import android.widget.LinearLayout;
 
 import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;