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/FocusHelper.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/FocusHelper.java')
| -rw-r--r-- | src/com/android/launcher3/FocusHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index de079feda..b36734bab 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -204,7 +204,7 @@ public class FocusHelper { return consume; } - final Launcher launcher = (Launcher) v.getContext(); + final Launcher launcher = Launcher.getLauncher(v.getContext()); final DeviceProfile profile = launcher.getDeviceProfile(); if (DEBUG) { @@ -333,7 +333,7 @@ public class FocusHelper { return consume; } - Launcher launcher = (Launcher) v.getContext(); + Launcher launcher = Launcher.getLauncher(v.getContext()); DeviceProfile profile = launcher.getDeviceProfile(); if (DEBUG) { |