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 /src | |
| 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 'src')
| -rw-r--r-- | src/com/android/launcher3/PreloadIconDrawable.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetsListAdapter.java | 3 |
2 files changed, 4 insertions, 1 deletions
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; |