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

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

Merge "Do not apply rounded corner background to task bar when it's in phone mode" into main

parents 52b5113e ec26a138

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

+8 −3
Original line number Diff line number Diff line
@@ -203,11 +203,16 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        Display display = windowContext.getDisplay();

        Context c = getApplicationContext();

        mWindowManager = c.getSystemService(WindowManager.class);

        mLeftCorner = display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_LEFT);

        mRightCorner = display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_RIGHT);



        // Inflate views.

        boolean phoneMode = TaskbarManager.isPhoneMode(mDeviceProfile);

        mLeftCorner = phoneMode

                ? null

                : display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_LEFT);

        mRightCorner = phoneMode

                ? null

                : display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_RIGHT);



        // Inflate views.

        int taskbarLayout = DisplayController.isTransientTaskbar(this) && !phoneMode

                ? R.layout.transient_taskbar

                : R.layout.taskbar;