aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 01:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of 2fd0208 to ub-launcher3-master

Browse Source 
Change-Id: I20ad6eaace81786be080e28d6eb551908add6d90
This commit is contained in:
Tony Wickham
2016-10-12 14:38:43 -07:00
parent 3f0a53fa44 2fd0208605
commit 6982de2485
18 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/launcher3/FocusHelper.java
View File

@@ -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) {