summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2018-02-16 03:23:47 +0000
committerWinson Chung <winsonc@google.com>2018-02-16 03:23:47 +0000
commitd7823941321e668ffa160f229344650864093dd2 (patch)
tree0dcb8d86126242279e422c66d48c14577cb9f4af /src
parentdd176e65e3af080529235984fa4a236fc266837f (diff)
downloadandroid_packages_apps_Trebuchet-d7823941321e668ffa160f229344650864093dd2.tar.gz
android_packages_apps_Trebuchet-d7823941321e668ffa160f229344650864093dd2.tar.bz2
android_packages_apps_Trebuchet-d7823941321e668ffa160f229344650864093dd2.zip
Revert "Revert "Remove back button when on home screen""
This reverts commit dd176e65e3af080529235984fa4a236fc266837f. Reason for revert: Post-drop revert Change-Id: If93eb4bca636bfba2471c8992621a59895bfcbe2
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 f6abae8ab..2e0483754 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -855,6 +855,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() {