Snap for 7201919 from 64394decb96293d7d1afac289f7a418e1246dad2 to rvc-qpr3-release (cc5b7814) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowlessWindowManager.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -156,7 +156,10 @@ public class WindowlessWindowManager implements IWindowSession {
		mStateForWindow.put(window.asBinder(), state);
		}

		return WindowManagerGlobal.ADD_OKAY \| WindowManagerGlobal.ADD_FLAG_APP_VISIBLE;
		final int res = WindowManagerGlobal.ADD_OKAY \| WindowManagerGlobal.ADD_FLAG_APP_VISIBLE;

		// Include whether the window is in touch mode.
		return isInTouchMode() ? res \| WindowManagerGlobal.ADD_FLAG_IN_TOUCH_MODE : res;
		}

		/**
		@@ -207,6 +210,15 @@ public class WindowlessWindowManager implements IWindowSession {
		return !PixelFormat.formatHasAlpha(attrs.format);
		}

		private boolean isInTouchMode() {
		try {
		return WindowManagerGlobal.getWindowSession().getInTouchMode();
		} catch (RemoteException e) {
		Log.e(TAG, "Unable to check if the window is in touch mode", e);
		}
		return false;
		}

		/** @hide */
		protected SurfaceControl getSurfaceControl(View rootView) {
		final ViewRootImpl root = rootView.getViewRootImpl();
		@@ -268,7 +280,8 @@ public class WindowlessWindowManager implements IWindowSession {
		}
		}

		return 0;
		// Include whether the window is in touch mode.
		return isInTouchMode() ? WindowManagerGlobal.RELAYOUT_RES_IN_TOUCH_MODE : 0;
		}

		@Override

+2 −0

Original line number	Diff line number	Diff line
		@@ -488,6 +488,8 @@
		<protected-broadcast android:name="android.app.action.ACTION_PASSWORD_FAILED" />
		<protected-broadcast android:name="android.app.action.ACTION_PASSWORD_SUCCEEDED" />
		<protected-broadcast android:name="com.android.server.ACTION_EXPIRED_PASSWORD_NOTIFICATION" />
		<protected-broadcast android:name="com.android.server.ACTION_PROFILE_OFF_DEADLINE" />
		<protected-broadcast android:name="com.android.server.ACTION_TURN_PROFILE_ON_NOTIFICATION" />

		<protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_ADDED" />
		<protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_UNLOCKED" />

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@
		android:gravity="center"
		android:orientation="vertical">

		<com.android.keyguard.PasswordTextView
		<com.android.systemui.car.keyguard.UnfocusablePasswordTextView
		android:id="@+id/pinEntry"
		android:layout_width="@dimen/keyguard_security_width"
		android:layout_height="@dimen/pin_entry_height"

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@
		android:gravity="center"
		android:orientation="vertical">

		<com.android.keyguard.PasswordTextView
		<com.android.systemui.car.keyguard.UnfocusablePasswordTextView
		android:id="@+id/pinEntry"
		android:layout_width="@dimen/keyguard_security_width"
		android:layout_height="@dimen/pin_entry_height"

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.car.keyguard;

		import android.content.Context;
		import android.util.AttributeSet;

		import com.android.keyguard.PasswordTextView;

		/** A version of {@link PasswordTextView} that is not focusable. */
		public class UnfocusablePasswordTextView extends PasswordTextView {
		public UnfocusablePasswordTextView(Context context) {
		this(context, null);
		}

		public UnfocusablePasswordTextView(Context context, AttributeSet attrs) {
		this(context, attrs, 0);
		}

		public UnfocusablePasswordTextView(Context context, AttributeSet attrs, int defStyleAttr) {
		this(context, attrs, defStyleAttr, 0);
		}

		public UnfocusablePasswordTextView(Context context, AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		setFocusableInTouchMode(false);
		setFocusable(false);
		}
		}