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

Commit 21095c0a authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master 

Bug: 151763422
Change-Id: Iaeff56dfa77dc2594d2572b6b60633d0d379caa7
parents bc2c9655 6f282502

protos/launcher_log.proto

+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ message Action { 
    AUTOMATED = 1;

    COMMAND = 2;

    TIP = 3;

    // SOFT_KEYBOARD, HARD_KEYBOARD, ASSIST

    SOFT_KEYBOARD = 4;

    // HARD_KEYBOARD, ASSIST

  }



  enum Touch {

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+0 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.launcher3.uioverrides; 
import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;



import android.content.Context;

import android.graphics.Rect;
@@ -49,7 +48,6 @@ import com.android.quickstep.SysUINavigationMode; 
import com.android.quickstep.SysUINavigationMode.Mode;

import com.android.quickstep.TouchInteractionService;

import com.android.quickstep.views.RecentsView;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.WindowManagerWrapper;



import java.util.ArrayList;
@@ -210,12 +208,6 @@ public abstract class RecentsUiFactory { 
        }

    }



    /** Closes system windows. */

    public static void closeSystemWindows() {

        ActivityManagerWrapper.getInstance()

            .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);

    }



    private static final class LauncherTaskViewController extends

            TaskViewTouchController<Launcher> {

quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsRootView.java

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ public class RecentsRootView extends BaseDragLayer<RecentsActivity> { 
        if (!insets.equals(mInsets)) {

            super.setInsets(insets);

        }

        setBackground(insets.top == 0 ? null

        setBackground(insets.top == 0  || !mAllowSysuiScrims

                ? null

                : Themes.getAttrDrawable(getContext(), R.attr.workspaceStatusBarScrim));

    }

quickstep/src/com/android/launcher3/uioverrides/UiFactory.java

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_COUNT; 
import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;

import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_COUNT;

import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;



import android.animation.AnimatorSet;

import android.animation.ValueAnimator;
@@ -58,6 +59,7 @@ import com.android.quickstep.SysUINavigationMode.Mode; 
import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;

import com.android.quickstep.util.RemoteFadeOutAnimationListener;

import com.android.systemui.shared.system.ActivityCompat;

import com.android.systemui.shared.system.ActivityManagerWrapper;



import java.io.ByteArrayOutputStream;

import java.io.PrintWriter;
@@ -252,5 +254,9 @@ public class UiFactory extends RecentsUiFactory { 
        return persons == null ? Utilities.EMPTY_PERSON_ARRAY : persons;

    }



    public static void closeSystemWindows() {}

    /** Closes system windows. */

    public static void closeSystemWindows() {

        ActivityManagerWrapper.getInstance()

            .closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);

    }

}

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -118,4 +118,7 @@ 


<!-- Recents -->

    <item type="id" name="overview_panel"/>



    <string-array name="live_wallpapers_remove_sysui_scrims">

    </string-array>

</resources>