Merge "Fix close and back buttons in caption proto 1." into tm-qpr-dev (16ac8f21) · Commits · e / os / android_frameworks_base

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