Merge "[Bouncer] Separate keyguard message areas." into tm-qpr-dev (87c84cb8) · Commits · e / os / android_frameworks_base

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

0 → 100644

+28 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!--
			~ Copyright (C) 2022 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
			-->
			<merge xmlns:android="http://schemas.android.com/apk/res/android">
			<com.android.keyguard.BouncerKeyguardMessageArea
			android:id="@+id/bouncer_message_area"
			style="@style/Keyguard.TextView"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/keyguard_lock_padding"
			android:ellipsize="marquee"
			android:focusable="true"
			android:gravity="center"
			android:singleLine="true" />
			</merge>

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@
	android:layout_gravity="center_horizontal\|bottom"		android:layout_gravity="center_horizontal\|bottom"
	android:gravity="bottom"		android:gravity="bottom"
	>		>
			<include layout="@layout/keyguard_bouncer_message_area"/>

	<Space		<Space
	android:layout_width="match_parent"		android:layout_width="match_parent"

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,7 @@
	android:layout_gravity="center_horizontal\|bottom"		android:layout_gravity="center_horizontal\|bottom"
	android:clipChildren="false"		android:clipChildren="false"
	android:clipToPadding="false">		android:clipToPadding="false">
			<include layout="@layout/keyguard_bouncer_message_area"/>

	<androidx.constraintlayout.widget.ConstraintLayout		<androidx.constraintlayout.widget.ConstraintLayout
	android:id="@+id/pattern_container"		android:id="@+id/pattern_container"

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@
	android:clipToPadding="false"		android:clipToPadding="false"
	android:orientation="vertical"		android:orientation="vertical"
	androidprv:layout_maxWidth="@dimen/keyguard_security_width">		androidprv:layout_maxWidth="@dimen/keyguard_security_width">
			<include layout="@layout/keyguard_bouncer_message_area"/>

	<androidx.constraintlayout.widget.ConstraintLayout		<androidx.constraintlayout.widget.ConstraintLayout
	android:id="@+id/pin_container"		android:id="@+id/pin_container"
	@@ -189,8 +190,6 @@

	</androidx.constraintlayout.widget.ConstraintLayout>		</androidx.constraintlayout.widget.ConstraintLayout>



	<include layout="@layout/keyguard_eca"		<include layout="@layout/keyguard_eca"
	android:id="@+id/keyguard_selector_fade_container"		android:id="@+id/keyguard_selector_fade_container"
	android:layout_width="match_parent"		android:layout_width="match_parent"

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

+5 −12

Original line number	Original line	Diff line number	Diff line
	@@ -26,20 +26,17 @@
	android:layout_height="match_parent"		android:layout_height="match_parent"
	androidprv:layout_maxWidth="@dimen/keyguard_security_width"		androidprv:layout_maxWidth="@dimen/keyguard_security_width"
	android:layout_gravity="center_horizontal\|bottom">		android:layout_gravity="center_horizontal\|bottom">
			<include layout="@layout/keyguard_bouncer_message_area" />
	<Space		<Space
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="0dp"		android:layout_height="0dp"
	android:layout_weight="1"		android:layout_weight="1" />
	/>

	<ImageView		<ImageView
	android:id="@+id/keyguard_sim"		android:id="@+id/keyguard_sim"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:tint="@color/background_protected"		android:tint="@color/background_protected"
	android:src="@drawable/ic_lockscreen_sim"/>		android:src="@drawable/ic_lockscreen_sim"/>

	<LinearLayout		<LinearLayout
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	@@ -52,14 +49,12 @@
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_marginTop="@dimen/eca_overlap" />		android:layout_marginTop="@dimen/eca_overlap" />

	<RelativeLayout		<RelativeLayout
	android:id="@+id/row0"		android:id="@+id/row0"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:paddingBottom="4dp"		android:paddingBottom="4dp"
	>		>

	<com.android.keyguard.PasswordTextView		<com.android.keyguard.PasswordTextView
	android:id="@+id/simPinEntry"		android:id="@+id/simPinEntry"
	style="@style/Widget.TextView.Password"		style="@style/Widget.TextView.Password"
	@@ -195,7 +190,6 @@
	/>		/>
	</LinearLayout>		</LinearLayout>
	</LinearLayout>		</LinearLayout>