Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ida957a4f906e07d8b187d81f5a1f79f860d83920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matt Sziklay
2023-02-21 15:59:23 +00:00
committed by Automerger Merge Worker
parent 88a3af1f4a 16ac8f216e
commit 54639353d6
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,6 +213,12 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
final View handle = caption.findViewById(R.id.caption_handle); final View handle = caption.findViewById(R.id.caption_handle);
handle.setOnTouchListener(mOnCaptionTouchListener); handle.setOnTouchListener(mOnCaptionTouchListener);
handle.setOnClickListener(mOnCaptionButtonClickListener); 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(); updateButtonVisibility();
} }
@@ -319,6 +325,14 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
final View handle = caption.findViewById(R.id.caption_handle); final View handle = caption.findViewById(R.id.caption_handle);
final Drawable handleBackground = handle.getBackground(); final Drawable handleBackground = handle.getBackground();
handleBackground.setTintList(buttonTintColor); 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() { private void closeDragResizeListener() {