diff options
| author | Tony Wickham <twickham@google.com> | 2016-10-12 14:38:43 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2016-10-12 14:38:43 -0700 |
| commit | 6982de2485ae516f02758bffd0cb0fdc4b127fef (patch) | |
| tree | 8f77e38f38d0b4278bfa370b11b6486f595b741b /src/com/android/launcher3/Hotseat.java | |
| parent | 3f0a53fa448fc077a1e3ca547bdd0f3bd408372f (diff) | |
| parent | 2fd020860533e18c64a93d14d11cb2d34bc9cbaf (diff) | |
| download | android_packages_apps_Trebuchet-6982de2485ae516f02758bffd0cb0fdc4b127fef.tar.gz android_packages_apps_Trebuchet-6982de2485ae516f02758bffd0cb0fdc4b127fef.tar.bz2 android_packages_apps_Trebuchet-6982de2485ae516f02758bffd0cb0fdc4b127fef.zip | |
resolve merge conflicts of 2fd0208 to ub-launcher3-master
Change-Id: I20ad6eaace81786be080e28d6eb551908add6d90
Diffstat (limited to 'src/com/android/launcher3/Hotseat.java')
| -rw-r--r-- | src/com/android/launcher3/Hotseat.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index 11d6b503b..b93c6dfa1 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -67,7 +67,7 @@ public class Hotseat extends FrameLayout public Hotseat(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - mLauncher = (Launcher) context; + mLauncher = Launcher.getLauncher(context); mHasVerticalHotseat = mLauncher.getDeviceProfile().isVerticalBarLayout(); mBackgroundColor = ColorUtils.setAlphaComponent( ContextCompat.getColor(context, R.color.all_apps_container_color), 0); |