Merge "Landscape PIN bouncer: layouts + code for landscape Pin bouncer" into udc-qpr-dev (4a12387b) · Commits · e / os / android_frameworks_base

packages/SystemUI/res-keyguard/layout-land/keyguard_pin_view.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		**
		** Copyright 2023, 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.
		*/
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<include layout="@layout/keyguard_pin_view_landscape" />

		</FrameLayout>

packages/SystemUI/res-keyguard/layout-sw600dp-land/keyguard_pin_view.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		**
		** Copyright 2023, 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.
		*/
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<include layout="@layout/keyguard_pin_view_portrait" />

		</FrameLayout>

packages/SystemUI/res-keyguard/layout/keyguard_pin_view_landscape.xml

0 → 100644

+231 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		**
		** Copyright 2023, 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.
		*/
		-->

		<com.android.keyguard.KeyguardPINView xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/res-auto"
		xmlns:tools="http://schemas.android.com/tools"
		android:id="@+id/keyguard_pin_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center_horizontal\|bottom"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="horizontal">

		<androidx.constraintlayout.widget.ConstraintLayout
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="2"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:layoutDirection="ltr"
		android:orientation="vertical">

		<include layout="@layout/keyguard_bouncer_message_area" />

		<com.android.systemui.bouncer.ui.BouncerMessageView
		android:id="@+id/bouncer_message_view"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		androidprv:layout_constraintBottom_toTopOf="@+id/row0"
		androidprv:layout_constraintTop_toTopOf="parent"
		androidprv:layout_constraintVertical_chainStyle="packed" />

		<!-- Set this to be just above key1. It would be better to introduce a barrier above
		key1/key2/key3, then place this View above that. Sadly, that doesn't work (the Barrier
		drops to the bottom of the page, and key1/2/3 all shoot up to the top-left). In any
		case, the Flow should ensure that key1/2/3 all have the same top, so this should be
		fine. -->
		<com.android.keyguard.AlphaOptimizedRelativeLayout
		android:id="@+id/row0"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingBottom="@dimen/num_pad_entry_row_margin_bottom"
		androidprv:layout_constraintBottom_toTopOf="@+id/keyguard_selector_fade_container"
		androidprv:layout_constraintTop_toBottomOf="@+id/bouncer_message_view"
		tools:layout_editor_absoluteX="-16dp">

		<com.android.keyguard.PasswordTextView
		android:id="@+id/pinEntry"
		style="@style/Widget.TextView.Password"
		android:layout_width="@dimen/keyguard_security_width"
		android:layout_height="@dimen/keyguard_password_height"
		android:layout_centerHorizontal="true"
		android:layout_marginRight="72dp"
		android:contentDescription="@string/keyguard_accessibility_pin_area"
		androidprv:scaledTextSize="@integer/scaled_password_text_size" />
		</com.android.keyguard.AlphaOptimizedRelativeLayout>

		<include
		android:id="@+id/keyguard_selector_fade_container"
		layout="@layout/keyguard_eca"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom\|center_horizontal"
		android:layout_marginBottom="@dimen/keyguard_eca_bottom_margin"
		android:layout_marginTop="@dimen/keyguard_eca_top_margin"
		android:gravity="center_horizontal"
		android:orientation="vertical"
		androidprv:layout_constraintBottom_toBottomOf="parent" />

		</androidx.constraintlayout.widget.ConstraintLayout>

		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/pin_container"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="3"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:layoutDirection="ltr"
		android:orientation="vertical">

		<!-- Guideline used to place the top row of keys relative to the screen height. This will be
		updated in KeyguardPINView to reduce the height of the PIN pad. -->
		<androidx.constraintlayout.widget.Guideline
		android:id="@+id/pin_pad_top_guideline"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		androidprv:layout_constraintGuide_percent="0" />

		<com.android.keyguard.KeyguardPinFlowView
		android:id="@+id/flow1"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="horizontal"

		androidprv:constraint_referenced_ids="key1,key2,key3,key4,key5,key6,key7,key8,key9,delete_button,key0,key_enter"

		androidprv:flow_horizontalGap="@dimen/num_pad_key_margin_end"

		androidprv:flow_horizontalStyle="packed"
		androidprv:flow_maxElementsWrap="3"

		androidprv:flow_verticalBias="0.5"
		androidprv:flow_verticalGap="@dimen/num_pad_entry_row_margin_bottom"
		androidprv:flow_verticalStyle="packed"

		androidprv:flow_wrapMode="aligned"
		androidprv:layout_constraintBottom_toBottomOf="parent"
		androidprv:layout_constraintEnd_toEndOf="parent"
		androidprv:layout_constraintStart_toStartOf="parent"
		androidprv:layout_constraintTop_toBottomOf="@id/pin_pad_top_guideline" />

		<com.android.keyguard.NumPadButton
		android:id="@+id/delete_button"
		style="@style/NumPadKey.Delete"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/key0"
		android:contentDescription="@string/keyboardview_keycode_delete" />

		<com.android.keyguard.NumPadButton
		android:id="@+id/key_enter"
		style="@style/NumPadKey.Enter"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:contentDescription="@string/keyboardview_keycode_enter" />

		<com.android.keyguard.NumPadKey
		android:id="@+id/key1"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/key2"
		androidprv:digit="1"
		androidprv:textView="@+id/pinEntry" />

		<com.android.keyguard.NumPadKey
		android:id="@+id/key2"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/key3"
		androidprv:digit="2"
		androidprv:textView="@+id/pinEntry" />

		<com.android.keyguard.NumPadKey
		android:id="@+id/key3"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/key4"
		androidprv:digit="3"
		androidprv:textView="@+id/pinEntry" />

		<com.android.keyguard.NumPadKey
		android:id="@+id/key4"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/key5"
		androidprv:digit="4"
		androidprv:textView="@+id/pinEntry" />

		<com.android.keyguard.NumPadKey
		android:id="@+id/key5"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/key6"
		androidprv:digit="5"
		androidprv:textView="@+id/pinEntry" />


		<com.android.keyguard.NumPadKey
		android:id="@+id/key6"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/key7"
		androidprv:digit="6"
		androidprv:textView="@+id/pinEntry" />

		<com.android.keyguard.NumPadKey
		android:id="@+id/key7"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/key8"
		androidprv:digit="7"
		androidprv:textView="@+id/pinEntry" />

		<com.android.keyguard.NumPadKey
		android:id="@+id/key8"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/key9"
		androidprv:digit="8"
		androidprv:textView="@+id/pinEntry" />

		<com.android.keyguard.NumPadKey
		android:id="@+id/key9"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/delete_button"
		androidprv:digit="9"
		androidprv:textView="@+id/pinEntry" />

		<com.android.keyguard.NumPadKey
		android:id="@+id/key0"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:accessibilityTraversalBefore="@id/key_enter"
		androidprv:digit="0"
		androidprv:textView="@+id/pinEntry" />

		</androidx.constraintlayout.widget.ConstraintLayout>

		</com.android.keyguard.KeyguardPINView>

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import android.app.ActivityManager;
		import android.app.admin.DevicePolicyManager;
		import android.content.Intent;
		import android.content.res.ColorStateList;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.hardware.biometrics.BiometricOverlayConstants;
		import android.media.AudioManager;
		@@ -143,7 +142,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		private Runnable mCancelAction;
		private boolean mWillRunDismissFromKeyguard;

		private int mLastOrientation = Configuration.ORIENTATION_UNDEFINED;
		private int mLastOrientation;

		private SecurityMode mCurrentSecurityMode = SecurityMode.Invalid;
		private UserSwitcherController.UserSwitchCallback mUserSwitchCallback =
		@@ -349,7 +348,14 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard

		@Override
		public void onDensityOrFontScaleChanged() {
		KeyguardSecurityContainerController.this.onDensityOrFontScaleChanged();
		KeyguardSecurityContainerController.this
		.onDensityOrFontScaleOrOrientationChanged();
		}

		@Override
		public void onOrientationChanged(int orientation) {
		KeyguardSecurityContainerController.this
		.onDensityOrFontScaleOrOrientationChanged();
		}
		};
		private final KeyguardUpdateMonitorCallback mKeyguardUpdateMonitorCallback =
		@@ -1154,7 +1160,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		}

		/** Handles density or font scale changes. */
		private void onDensityOrFontScaleChanged() {
		private void onDensityOrFontScaleOrOrientationChanged() {
		reinflateViewFlipper(controller -> mView.onDensityOrFontScaleChanged());
		}

packages/SystemUI/src/com/android/keyguard/NumPadAnimator.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ class NumPadAnimator {
		private float mStartRadius;
		private float mEndRadius;
		private int mHeight;
		private int mWidth;

		private static final int EXPAND_ANIMATION_MS = 100;
		private static final int EXPAND_COLOR_ANIMATION_MS = 50;
		@@ -95,11 +96,17 @@ class NumPadAnimator {
		mBackground.setCornerRadius(mEndRadius + (mStartRadius - mEndRadius) * progress);
		int height = (int) (mHeight * 0.7f + mHeight * 0.3 * progress);
		int difference = mHeight - height;
		mBackground.setBounds(0, difference / 2, mHeight, mHeight - difference / 2);

		int left = 0;
		int top = difference / 2;
		int right = mWidth;
		int bottom = mHeight - difference / 2;
		mBackground.setBounds(left, top, right, bottom);
		}

		void onLayout(int height) {
		void onLayout(int width, int height) {
		boolean shouldUpdateHeight = height != mHeight;
		mWidth = width;
		mHeight = height;
		mStartRadius = height / 2f;
		mEndRadius = height / 4f;