Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4661a257 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Fixing regression in dismissing Recents."

parents 510eb068 6cb485fd

core/java/com/android/internal/statusbar/IStatusBar.aidl

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ oneway interface IStatusBar 
    void setWindowState(int window, int state);



    void showRecentApps(boolean triggeredFromAltTab);

    void hideRecentApps();

    void hideRecentApps(boolean triggeredFromAltTab);

    void toggleRecentApps();

    void preloadRecentApps();

    void cancelPreloadRecentApps();

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ interface IStatusBarService 
    void setWindowState(int window, int state);



    void showRecentApps(boolean triggeredFromAltTab);

    void hideRecentApps();

    void hideRecentApps(boolean triggeredFromAltTab);

    void toggleRecentApps();

    void preloadRecentApps();

    void cancelPreloadRecentApps();

packages/SystemUI/src/com/android/systemui/RecentsComponent.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.view.View; 


public interface RecentsComponent {

    void showRecents(boolean triggeredFromAltTab, View statusBarView);

    void hideRecents();

    void hideRecents(boolean triggeredFromAltTab);

    void toggleRecents(Display display, int layoutDirection, View statusBarView);

    void preloadRecents();

    void cancelPreloadingRecents();

packages/SystemUI/src/com/android/systemui/recent/Recents.java

+2 −2
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ public class Recents extends SystemUI implements RecentsComponent { 
    }



    @Override

    public void hideRecents() {

    public void hideRecents(boolean triggeredFromAltTab) {

        if (mUseAlternateRecents) {

            mAlternateRecents.onHideRecents();

            mAlternateRecents.onHideRecents(triggeredFromAltTab);

        } else {

            Intent intent = new Intent(RecentsActivity.CLOSE_RECENTS_INTENT);

            intent.setPackage("com.android.systemui");

packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java

+2 −2
Original line number Diff line number Diff line
@@ -185,13 +185,13 @@ public class AlternateRecentsComponent { 
    }



    /** Hides the recents */

    public void onHideRecents() {

    public void onHideRecents(boolean triggeredFromAltTab) {

        Console.log(Constants.Log.App.RecentsComponent, "[RecentsComponent|hideRecents]");

        if (mServiceIsBound) {

            // Notify recents to close it

            try {

                Bundle data = new Bundle();

                Message msg = Message.obtain(null, MSG_HIDE_RECENTS, 0, 0);

                Message msg = Message.obtain(null, MSG_HIDE_RECENTS, triggeredFromAltTab ? 1 : 0, 0);

                msg.setData(data);

                mService.send(msg);

            } catch (RemoteException re) {