openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Unifying the two different state listeners 

Bug: 123376689
Change-Id: I61d4865044a1bd27ee78002a4083a686233740b7
This commit is contained in:
Sunny Goyal 2019-01-28 11:56:13 -08:00
parent 68c6254fb0
commit 7f45514d15
3 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
View File

@ -123,11 +123,6 @@ public class UiFactory {
public static void onCreate(Launcher launcher) {
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) {
}
@ -150,11 +145,6 @@ public class UiFactory {
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) {
}

22
src/com/android/launcher3/LauncherStateManager.java
View File

@ -233,9 +233,6 @@ public class LauncherStateManager {
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 class LauncherStateManager {
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 @@ public class LauncherStateManager {
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 @@ public class LauncherStateManager {
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 @@ public class LauncherStateManager {
}
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 class LauncherStateManager {
public interface StateListener {
/**
* Called when the state is set without an animation.
*/
void onStateSetImmediately(LauncherState state);
void onStateTransitionStart(LauncherState toState);
void onStateTransitionComplete(LauncherState finalState);
}

9
src/com/android/launcher3/views/ScrimView.java
View File

@ -315,7 +315,7 @@ public class ScrimView extends View implements Insettable, OnChangeListener,
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 @@ public class ScrimView extends View implements Insettable, OnChangeListener,
@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);
}