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

Commit 7609f84b authored by mattsziklay's avatar mattsziklay
Browse files

Fix close and back buttons in caption proto 1. 

Restores click listeners to back and close buttons and adjusts their
tint in the same fashion as handle.

Bug: 269660870
Test: Manual testing - confirm buttons function and display correctly in
proto 1, confirm proto 2 is unaffected.

Change-Id: I8a6dcd10d8816ae59e6551e77aef1b2753be3c33
parent e397435f

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+14 −0
Original line number Diff line number Diff line
@@ -213,6 +213,12 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        final View handle = caption.findViewById(R.id.caption_handle);

        handle.setOnTouchListener(mOnCaptionTouchListener);

        handle.setOnClickListener(mOnCaptionButtonClickListener);

        if (DesktopModeStatus.isProto1Enabled()) {

            final View back = caption.findViewById(R.id.back_button);

            back.setOnClickListener(mOnCaptionButtonClickListener);

            final View close = caption.findViewById(R.id.close_window);

            close.setOnClickListener(mOnCaptionButtonClickListener);

        }

        updateButtonVisibility();

    }
@@ -319,6 +325,14 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        final View handle = caption.findViewById(R.id.caption_handle);

        final Drawable handleBackground = handle.getBackground();

        handleBackground.setTintList(buttonTintColor);

        if (DesktopModeStatus.isProto1Enabled()) {

            final View back = caption.findViewById(R.id.back_button);

            final Drawable backBackground = back.getBackground();

            backBackground.setTintList(buttonTintColor);

            final View close = caption.findViewById(R.id.close_window);

            final Drawable closeBackground = close.getBackground();

            closeBackground.setTintList(buttonTintColor);

        }

    }



    private void closeDragResizeListener() {