Unifying the two different state listeners
Bug: 123376689
Change-Id: I61d4865044a1bd27ee78002a4083a686233740b7
diff --git a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
index d295ac5..d0a9e3c 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
@@ -124,11 +124,6 @@
if (!launcher.getSharedPrefs().getBoolean(HOME_BOUNCE_SEEN, false)) {
launcher.getStateManager().addStateListener(new LauncherStateManager.StateListener() {
@Override
- public void onStateSetImmediately(LauncherState state) {
- onStateTransitionComplete(state);
- }
-
- @Override
public void onStateTransitionStart(LauncherState toState) {
}
@@ -151,11 +146,6 @@
if (!launcher.getSharedPrefs().getBoolean(SHELF_BOUNCE_SEEN, false)) {
launcher.getStateManager().addStateListener(new LauncherStateManager.StateListener() {
@Override
- public void onStateSetImmediately(LauncherState state) {
- onStateTransitionComplete(state);
- }
-
- @Override
public void onStateTransitionStart(LauncherState toState) {
}
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 5d3ff53..df8ac99 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -233,9 +233,6 @@
handler.setState(state);
}
- for (int i = mListeners.size() - 1; i >= 0; i--) {
- mListeners.get(i).onStateSetImmediately(state);
- }
onStateTransitionEnd(state);
// Run any queued runnable
@@ -368,9 +365,6 @@
public void onAnimationStart(Animator animation) {
// Change the internal state only when the transition actually starts
onStateTransitionStart(state);
- for (int i = mListeners.size() - 1; i >= 0; i--) {
- mListeners.get(i).onStateTransitionStart(state);
- }
}
@Override
@@ -380,9 +374,6 @@
onCompleteRunnable.run();
}
onStateTransitionEnd(state);
- for (int i = mListeners.size() - 1; i >= 0; i--) {
- mListeners.get(i).onStateTransitionComplete(state);
- }
}
});
mConfig.setAnimation(animation, state);
@@ -402,6 +393,10 @@
mLauncher.getWorkspace().setClipChildren(false);
}
UiFactory.onLauncherStateOrResumeChanged(mLauncher);
+
+ for (int i = mListeners.size() - 1; i >= 0; i--) {
+ mListeners.get(i).onStateTransitionStart(state);
+ }
}
private void onStateTransitionEnd(LauncherState state) {
@@ -420,6 +415,10 @@
}
UiFactory.onLauncherStateOrResumeChanged(mLauncher);
+
+ for (int i = mListeners.size() - 1; i >= 0; i--) {
+ mListeners.get(i).onStateTransitionComplete(state);
+ }
}
public void onWindowFocusChanged() {
@@ -598,11 +597,6 @@
public interface StateListener {
- /**
- * Called when the state is set without an animation.
- */
- void onStateSetImmediately(LauncherState state);
-
void onStateTransitionStart(LauncherState toState);
void onStateTransitionComplete(LauncherState finalState);
}
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index deb0965..a264f9b 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -315,7 +315,7 @@
if (enabled) {
stateManager.addStateListener(this);
- onStateSetImmediately(mLauncher.getStateManager().getState());
+ handleStateChangedComplete(mLauncher.getStateManager().getState());
} else {
setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
}
@@ -361,12 +361,11 @@
@Override
public void onStateTransitionComplete(LauncherState finalState) {
- onStateSetImmediately(finalState);
+ handleStateChangedComplete(finalState);
}
- @Override
- public void onStateSetImmediately(LauncherState state) {
- setImportantForAccessibility(state == ALL_APPS
+ private void handleStateChangedComplete(LauncherState finalState) {
+ setImportantForAccessibility(finalState == ALL_APPS
? IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
: IMPORTANT_FOR_ACCESSIBILITY_AUTO);
}