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

Commit c6eca1da authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev 

am: b3e26a9b

* commit 'b3e26a9b':
  Fix wrong transition when dock minimized and docked app launched

Change-Id: Ie1982a5e495794e8624c93e970896445579fa98f
parents 5ee2dd92 b3e26a9b

core/java/android/view/WindowManagerPolicy.java

+1 −1
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ public interface WindowManagerPolicy { 
     * Show the recents task list app.

     * @hide

     */

    public void showRecentApps();

    public void showRecentApps(boolean fromHome);



    /**

     * Show the global actions dialog.

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ oneway interface IStatusBar 
    void notificationLightOff();

    void notificationLightPulse(int argb, int millisOn, int millisOff);



    void showRecentApps(boolean triggeredFromAltTab);

    void showRecentApps(boolean triggeredFromAltTab, boolean fromHome);

    void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);

    void toggleRecentApps();

    void toggleSplitScreen();

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

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ interface IStatusBarService 
    void setSystemUiVisibility(int vis, int mask, String cause);

    void setWindowState(int window, int state);



    void showRecentApps(boolean triggeredFromAltTab);

    void showRecentApps(boolean triggeredFromAltTab, boolean fromHome);

    void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);

    void toggleRecentApps();

    void preloadRecentApps();

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.Display; 
import android.view.View;



public interface RecentsComponent {

    void showRecents(boolean triggeredFromAltTab, View statusBarView);

    void showRecents(boolean triggeredFromAltTab, boolean fromHome, View statusBarView);

    void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);

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

    void preloadRecents();

packages/SystemUI/src/com/android/systemui/recents/IRecentsNonSystemUserCallbacks.aidl

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ oneway interface IRecentsNonSystemUserCallbacks { 
    void preloadRecents();

    void cancelPreloadingRecents();

    void showRecents(boolean triggeredFromAltTab, boolean draggingInRecents, boolean animate,

            boolean reloadTasks);

            boolean reloadTasks, boolean fromHome);

    void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);

    void toggleRecents();

    void onConfigurationChanged();