summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-02-16 04:43:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-02-16 04:43:59 +0000
commit7fa87bb1f11b4cd68dc0aecd8738a8dc115d4efc (patch)
tree5920f13f5a5ad1e0109686beeb51ff0a32bb0f04 /src
parent021c06cde938cd3950301b0e41bf37f8ebe54fec (diff)
parentd7823941321e668ffa160f229344650864093dd2 (diff)
downloadandroid_packages_apps_Trebuchet-7fa87bb1f11b4cd68dc0aecd8738a8dc115d4efc.tar.gz
android_packages_apps_Trebuchet-7fa87bb1f11b4cd68dc0aecd8738a8dc115d4efc.tar.bz2
android_packages_apps_Trebuchet-7fa87bb1f11b4cd68dc0aecd8738a8dc115d4efc.zip
Merge "Revert "Revert "Remove back button when on home screen""" into ub-launcher3-master
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java6
-rw-r--r--src/com/android/launcher3/LauncherStateManager.java6
2 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0ed5de165..b4093b7d1 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -858,6 +858,12 @@ public class Launcher extends BaseActivity
}
}
+ @Override
+ public void onWindowFocusChanged(boolean hasFocus) {
+ super.onWindowFocusChanged(hasFocus);
+ mStateManager.onWindowFocusChanged();
+ }
+
public interface LauncherOverlay {
/**
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 6050d15da..e0b84bf46 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -303,6 +303,12 @@ public class LauncherStateManager {
if (state == NORMAL) {
setRestState(null);
}
+
+ UiFactory.onLauncherStateOrFocusChanged(mLauncher);
+ }
+
+ public void onWindowFocusChanged() {
+ UiFactory.onLauncherStateOrFocusChanged(mLauncher);
}
public LauncherState getLastState() {