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

Commit 0f7a74a2 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Add task bar window of TYPE_NAVIGATION_BAR when FLAG_HIDE_NAVBAR_WINDOW is on" into main

parents 0fcd2311 f767c868

quickstep/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ 
    <uses-permission android:name="android.permission.REMOVE_TASKS"/>

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>

    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_TASKS"/>

    <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW"/>

    <uses-permission android:name="android.permission.STATUS_BAR"/>

    <uses-permission android:name="android.permission.STATUS_BAR_SERVICE"/>

    <uses-permission android:name="android.permission.STOP_APP_SWITCHES"/>

    <uses-permission android:name="android.permission.SET_ORIENTATION"/>

    <uses-permission android:name="android.permission.READ_FRAME_BUFFER"/>

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

+5 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.os.Trace.TRACE_TAG_APP; 
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;

import static android.window.SplashScreen.SPLASH_SCREEN_STYLE_UNDEFINED;
@@ -430,9 +431,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
     * for taskbar showing as navigation bar

     */

    private WindowManager.LayoutParams createAllWindowParams() {

        final int windowType =

                FLAG_HIDE_NAVBAR_WINDOW ? TYPE_NAVIGATION_BAR : TYPE_NAVIGATION_BAR_PANEL;

        WindowManager.LayoutParams windowLayoutParams =

                createDefaultWindowLayoutParams(TYPE_NAVIGATION_BAR_PANEL,

                        TaskbarActivityContext.WINDOW_TITLE);

                createDefaultWindowLayoutParams(windowType, TaskbarActivityContext.WINDOW_TITLE);

        boolean isPhoneNavMode = TaskbarManager.isPhoneButtonNavMode(this);

        if (!isPhoneNavMode) {

            return windowLayoutParams;
@@ -445,7 +447,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        windowLayoutParams.paramsForRotation = new WindowManager.LayoutParams[4];

        for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) {

            WindowManager.LayoutParams lp =

                    createDefaultWindowLayoutParams(TYPE_NAVIGATION_BAR_PANEL,

                    createDefaultWindowLayoutParams(windowType,

                            TaskbarActivityContext.WINDOW_TITLE);

            switch (rot) {

                case Surface.ROTATION_0, Surface.ROTATION_180 -> {

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

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.launcher3.taskbar; 
import static android.content.Context.RECEIVER_NOT_EXPORTED;

import static android.content.pm.PackageManager.FEATURE_PC;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;



import static com.android.launcher3.LauncherPrefs.TASKBAR_PINNING;
@@ -209,7 +210,8 @@ public class TaskbarManager { 
    public TaskbarManager(TouchInteractionService service) {

        Display display =

                service.getSystemService(DisplayManager.class).getDisplay(DEFAULT_DISPLAY);

        mContext = service.createWindowContext(display, TYPE_NAVIGATION_BAR_PANEL, null);

        mContext = service.createWindowContext(display,

                FLAG_HIDE_NAVBAR_WINDOW ? TYPE_NAVIGATION_BAR : TYPE_NAVIGATION_BAR_PANEL, null);

        if (enableTaskbarNoRecreate()) {

            mWindowManager = mContext.getSystemService(WindowManager.class);

            mTaskbarRootLayout = new FrameLayout(mContext) {