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

Commit 54639353 authored by Matt Sziklay's avatar Matt Sziklay Committed by Automerger Merge Worker
Browse files

Merge "Fix close and back buttons in caption proto 1." into tm-qpr-dev am: 16ac8f21 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21486865



Change-Id: Ida957a4f906e07d8b187d81f5a1f79f860d83920
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88a3af1f 16ac8f21

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() {