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

Commit ce4df6a8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9459725 from daffdfa3 to tm-qpr2-release 

Change-Id: Ic51517eb99617cd54400de817dc105a34e538103
parents dc325785 daffdfa3

quickstep/res/layout/task.xml

+3 −1
Original line number Diff line number Diff line
@@ -28,12 +28,14 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <!-- Filtering affects only alpha instead of the visibility since visibility can be altered

         separately through RecentsView#resetFromSplitSelectionState() -->

    <ImageView

        android:id="@+id/show_windows"

        android:layout_height="@dimen/recents_filter_icon_size"

        android:layout_width="@dimen/recents_filter_icon_size"

        android:layout_gravity="end"

        android:visibility="gone"

        android:alpha="0"

        android:tint="@color/recents_filter_icon"

        android:contentDescription="@string/recents_filter_icon_desc"

        android:importantForAccessibility="no"

quickstep/res/layout/task_grouped.xml

+6 −2
Original line number Diff line number Diff line
@@ -38,23 +38,27 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <!-- Filtering affects only alpha instead of the visibility since visibility can be altered

         separately through RecentsView#resetFromSplitSelectionState() -->

    <ImageView

        android:id="@+id/show_windows"

        android:layout_height="@dimen/recents_filter_icon_size"

        android:layout_width="@dimen/recents_filter_icon_size"

        android:layout_gravity="start"

        android:visibility="gone"

        android:alpha="0"

        android:tint="@color/recents_filter_icon"

        android:contentDescription="@string/recents_filter_icon_desc"

        android:importantForAccessibility="no"

        android:src="@drawable/ic_select_windows" />



    <!-- Filtering affects only alpha instead of the visibility since visibility can be altered

         separately through RecentsView#resetFromSplitSelectionState() -->

    <ImageView

        android:id="@+id/show_windows_right"

        android:layout_height="@dimen/recents_filter_icon_size"

        android:layout_width="@dimen/recents_filter_icon_size"

        android:layout_gravity="end"

        android:visibility="gone"

        android:alpha="0"

        android:tint="@color/recents_filter_icon"

        android:contentDescription="@string/recents_filter_icon_desc"

        android:importantForAccessibility="no"

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
            return;

        }

        mTaskbarInAppDisplayProgress.put(progressIndex, progress);

        if (!mControllers.taskbarStashController.isInApp()

        if (mControllers.uiController.isIconAlignedWithHotseat()

                && !mTaskbarLauncherStateController.isAnimatingToLauncher()) {

            // Only animate the nav buttons while home and not animating home, otherwise let

            // the TaskbarViewController handle it.

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+6 −0
Original line number Diff line number Diff line
@@ -320,6 +320,12 @@ public class TaskbarManager { 
        }

    }



    public void onLongPressHomeEnabled(boolean assistantLongPressEnabled) {

        if (mNavButtonController != null) {

            mNavButtonController.setAssistantLongPressEnabled(assistantLongPressEnabled);

        }

    }



    /**

     * Sets the flag indicating setup UI is visible

     */

quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java

+6 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa 


    private long mLastScreenPinLongPress;

    private boolean mScreenPinned;

    private boolean mAssistantLongPressEnabled;



    @Override

    public void dumpLogs(String prefix, PrintWriter pw) {
@@ -251,6 +252,10 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa 
        mStatsLogManager = null;

    }



    public void setAssistantLongPressEnabled(boolean assistantLongPressEnabled) {

        mAssistantLongPressEnabled = assistantLongPressEnabled;

    }



    private void logEvent(StatsLogManager.LauncherEvent event) {

        if (mStatsLogManager == null) {

            Log.w(TAG, "No stats log manager to log taskbar button event");
@@ -289,7 +294,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa 
    }



    private void startAssistant() {

        if (mScreenPinned) {

        if (mScreenPinned || !mAssistantLongPressEnabled) {

            return;

        }

        Bundle args = new Bundle();