diff options
| -rw-r--r-- | res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/PreloadIconDrawable.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetsListAdapter.java | 3 |
4 files changed, 11 insertions, 4 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> diff --git a/res/values/styles.xml b/res/values/styles.xml index 92cbe044c..92ec874ba 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> diff --git a/src/com/android/launcher3/PreloadIconDrawable.java b/src/com/android/launcher3/PreloadIconDrawable.java index b064c47fc..a9acf087c 100644 --- a/src/com/android/launcher3/PreloadIconDrawable.java +++ b/src/com/android/launcher3/PreloadIconDrawable.java @@ -60,7 +60,7 @@ public class PreloadIconDrawable extends Drawable { 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); diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java index 55a2f7a34..33f2ae76d 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.view.ViewGroup.LayoutParams; 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; |