c41e408aea
Replace the negative margin + inset background hack with a overriding call to requestRectangleOnScreen, which will also make a best effort to show all the password requirements if there are multiple of them. Bug: 38236574 Test: Added ScrollToParentEditTextTest Change-Id: Id570652b64434b2d0b25c231540375d93884aaa9
102 lines
4.1 KiB
XML
102 lines
4.1 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2015 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"
|
|
android:importantForAutofill="noExcludeDescendants">
|
|
|
|
<include layout="@layout/confirm_lock_background_base" />
|
|
|
|
<LinearLayout
|
|
android:id="@+id/topLayout"
|
|
android:orientation="vertical"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<TextView
|
|
style="@android:style/TextAppearance.Material.Title"
|
|
android:id="@+id/headerText"
|
|
android:layout_marginStart="24dp"
|
|
android:layout_marginEnd="24dp"
|
|
android:layout_marginTop="12dp"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:textColor="?android:attr/colorAccent"/>
|
|
|
|
<TextView
|
|
style="@android:style/TextAppearance.Material.Body1"
|
|
android:id="@+id/detailsText"
|
|
android:layout_marginStart="24dp"
|
|
android:layout_marginEnd="24dp"
|
|
android:layout_marginTop="8dp"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1">
|
|
|
|
<Button
|
|
style="@android:style/Widget.Material.Button.Borderless"
|
|
android:id="@+id/cancelButton"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="start|bottom"
|
|
android:text="@string/cancel"
|
|
android:layout_marginStart="8dp"
|
|
android:layout_marginEnd="8dp"
|
|
android:layout_marginBottom="14dp"/>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_vertical"
|
|
android:gravity="center_horizontal"
|
|
android:orientation="vertical">
|
|
|
|
<com.android.settings.widget.ScrollToParentEditText
|
|
android:id="@+id/password_entry"
|
|
android:layout_width="208dp"
|
|
android:layout_height="wrap_content"
|
|
android:inputType="textPassword"
|
|
android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
|
|
android:gravity="center"
|
|
android:textSize="16sp"
|
|
style="@style/TextAppearance.PasswordEntry"/>
|
|
|
|
<TextView style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
|
|
android:accessibilityLiveRegion="polite"
|
|
android:id="@+id/errorText"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="10dp"/>
|
|
|
|
</LinearLayout>
|
|
|
|
<ImageView
|
|
android:id="@+id/fingerprintIcon"
|
|
android:layout_gravity="end|bottom"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="28dp"
|
|
android:layout_marginEnd="20dp"
|
|
android:visibility="gone"/>
|
|
</FrameLayout>
|
|
|
|
</LinearLayout>
|
|
</FrameLayout> |