Merge "Condense landscape layout of auth credential password view" into rvc-dev (1148f810) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout-land/auth_credential_password_view.xml

0 → 100644

+61 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2020 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.systemui.biometrics.AuthCredentialPasswordView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:gravity="center_horizontal"
		android:elevation="@dimen/biometric_dialog_elevation">

		<TextView
		android:id="@+id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/TextAppearance.AuthCredential.Title"/>

		<TextView
		android:id="@+id/subtitle"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/TextAppearance.AuthCredential.Subtitle"/>

		<TextView
		android:id="@+id/description"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/TextAppearance.AuthCredential.Description"/>

		<EditText
		android:id="@+id/lockPassword"
		android:layout_width="208dp"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:minHeight="48dp"
		android:gravity="center"
		android:inputType="textPassword"
		android:maxLength="500"
		android:imeOptions="actionNext\|flagNoFullscreen\|flagForceAscii"
		style="@style/TextAppearance.AuthCredential.PasswordEntry"/>

		<TextView
		android:id="@+id/error"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/TextAppearance.AuthCredential.Error"/>

		</com.android.systemui.biometrics.AuthCredentialPasswordView>
		No newline at end of file

packages/SystemUI/res/values/styles.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@

		<style name="TextAppearance.AuthCredential.Title">
		<item name="android:fontFamily">google-sans</item>
		<item name="android:paddingTop">16dp</item>
		<item name="android:paddingTop">12dp</item>
		<item name="android:paddingHorizontal">24dp</item>
		<item name="android:textSize">24sp</item>
		</style>
		@@ -278,7 +278,7 @@
		</style>

		<style name="TextAppearance.AuthCredential.Error">
		<item name="android:paddingTop">12dp</item>
		<item name="android:paddingTop">6dp</item>
		<item name="android:paddingHorizontal">24dp</item>
		<item name="android:textSize">14sp</item>
		<item name="android:textColor">?android:attr/colorError</item>

packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -220,15 +220,18 @@ public abstract class AuthCredentialView extends LinearLayout {
		setTextOrHide(mDescriptionView, getDescription(mBiometricPromptBundle));
		announceForAccessibility(title);

		if (mIconView != null) {
		final boolean isManagedProfile = Utils.isManagedProfile(mContext, mEffectiveUserId);
		final Drawable image;
		if (isManagedProfile) {
		image = getResources().getDrawable(R.drawable.auth_dialog_enterprise,
		mContext.getTheme());
		} else {
		image = getResources().getDrawable(R.drawable.auth_dialog_lock, mContext.getTheme());
		image = getResources().getDrawable(R.drawable.auth_dialog_lock,
		mContext.getTheme());
		}
		mIconView.setImageDrawable(image);
		}

		// Only animate this if we're transitioning from a biometric view.
		if (mShouldAnimateContents) {