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

Commit c0098a86 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Removing logs" into sc-v2-dev am: c1afaa40 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16248600

Change-Id: Ie38f32ba284d072a11d94ec314a1d50f9beacf26
parents f36ba262 c1afaa40

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

+0 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_M 
import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;



import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN;

import static com.android.launcher3.testing.TestProtocol.TASKBAR_WINDOW_CRASH;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;

import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
@@ -204,7 +203,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
        updateSysuiStateFlags(sharedState.sysuiStateFlags, true /* fromInit */);



        mWindowManager.addView(mDragLayer, mWindowLayoutParams);

        Log.d(TASKBAR_WINDOW_CRASH, "Adding taskbar window");

    }



    public boolean isThreeButtonNav() {
@@ -340,7 +338,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
        setUIController(TaskbarUIController.DEFAULT);

        mControllers.onDestroy();

        mWindowManager.removeViewImmediate(mDragLayer);

        Log.d(TASKBAR_WINDOW_CRASH, "Removing taskbar window");

    }



    public void updateSysuiStateFlags(int systemUiStateFlags, boolean fromInit) {

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

+0 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.launcher3.taskbar; 
import static android.view.Display.DEFAULT_DISPLAY;

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



import static com.android.launcher3.testing.TestProtocol.TASKBAR_WINDOW_CRASH;

import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;

import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;

import static com.android.launcher3.util.DisplayController.CHANGE_SUPPORTED_BOUNDS;
@@ -206,8 +205,6 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen 
    }



    private void recreateTaskbar() {

        Log.d(TASKBAR_WINDOW_CRASH, "Recreating taskbar: mTaskbarActivityContext="

                + mTaskbarActivityContext);

        destroyExistingTaskbar();



        DeviceProfile dp =
@@ -230,7 +227,6 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen 
            mTaskbarActivityContext.setUIController(

                    createTaskbarUIControllerForActivity(mActivity));

        }

        Log.d(TASKBAR_WINDOW_CRASH, "Finished recreating taskbar");

    }



    public void onSystemUiFlagsChanged(int systemUiStateFlags) {

quickstep/src/com/android/quickstep/TouchInteractionService.java

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static android.view.MotionEvent.ACTION_UP; 


import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.testing.TestProtocol.TASKBAR_WINDOW_CRASH;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.quickstep.GestureState.DEFAULT_STATE;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
@@ -361,7 +360,6 @@ public class TouchInteractionService extends Service 
    @Override

    public void onCreate() {

        super.onCreate();

        Log.d(TASKBAR_WINDOW_CRASH, "TIS created");

        // Initialize anything here that is needed in direct boot mode.

        // Everything else should be initialized in onUserUnlocked() below.

        mMainChoreographer = Choreographer.getInstance();
@@ -523,7 +521,6 @@ public class TouchInteractionService extends Service 
    @Override

    public void onDestroy() {

        Log.d(TAG, "Touch service destroyed: user=" + getUserId());

        Log.d(TASKBAR_WINDOW_CRASH, "TIS destroyed");

        sIsInitialized = false;

        if (mDeviceState.isUserUnlocked()) {

            mInputConsumer.unregisterInputConsumer();

src/com/android/launcher3/testing/TestProtocol.java

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ public final class TestProtocol { 
    public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";



    public static final String PERMANENT_DIAG_TAG = "TaplTarget";

    public static final String TASKBAR_WINDOW_CRASH = "b/201305599";

    public static final String TASK_VIEW_ID_CRASH = "b/195430732";

    public static final String NO_DROP_TARGET = "b/195031154";

    public static final String NULL_INT_SET = "b/200572078";