7100caa75e
Fixes an issue where the buttons on the biometric prompt would fail to wrap to a second line in order to accommodate long label text. This caused the buttons to be truncated in some languages (e.g. Russian). Test: On a Pixel 4 XL: 1. Ensure a lock pattern is set and Face Unlock is enabled 2. Set the system language to Russian (Russia) 3. Open wifi settings and select a saved network 4. Tap on the "Share" button for this network 5. Wait for Face Unlock to time out for the prompt 6. Rotate the device between portrait and landscape Fixes: 158240727 Change-Id: I51da6b124ffcd867322ee699e3908847e1df7ecd
112 lines
4.6 KiB
XML
112 lines
4.6 KiB
XML
<!--
|
|
~ Copyright (C) 2019 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">
|
|
|
|
<TextView
|
|
android:id="@+id/title"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="@integer/biometric_dialog_text_gravity"
|
|
style="@style/TextAppearance.AuthCredential.Title"/>
|
|
|
|
<TextView
|
|
android:id="@+id/subtitle"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="@integer/biometric_dialog_text_gravity"
|
|
style="@style/TextAppearance.AuthCredential.Subtitle"/>
|
|
|
|
<TextView
|
|
android:id="@+id/description"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="@integer/biometric_dialog_text_gravity"
|
|
style="@style/TextAppearance.AuthCredential.Description"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/biometric_icon"
|
|
android:layout_width="@dimen/biometric_dialog_biometric_icon_size"
|
|
android:layout_height="@dimen/biometric_dialog_biometric_icon_size"
|
|
android:paddingTop="48dp"
|
|
android:layout_gravity="center_horizontal"
|
|
android:scaleType="fitXY" />
|
|
|
|
<TextView
|
|
android:id="@+id/indicator"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingHorizontal="24dp"
|
|
android:paddingVertical="12dp"
|
|
android:textSize="12sp"
|
|
android:gravity="center_horizontal"
|
|
android:accessibilityLiveRegion="polite"
|
|
android:textColor="@color/biometric_dialog_gray"/>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/button_bar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="88dp"
|
|
style="?android:attr/buttonBarStyle"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="16dp">
|
|
<Space android:id="@+id/leftSpacer"
|
|
android:layout_width="8dp"
|
|
android:layout_height="match_parent"
|
|
android:visibility="visible" />
|
|
<!-- Negative Button -->
|
|
<Button android:id="@+id/button_negative"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"
|
|
android:layout_gravity="center_vertical"
|
|
android:ellipsize="end"
|
|
android:maxLines="2"
|
|
android:maxWidth="@dimen/biometric_dialog_button_negative_max_width"/>
|
|
<Space android:id="@+id/middleSpacer"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1"
|
|
android:visibility="visible"/>
|
|
<!-- Positive Button -->
|
|
<Button android:id="@+id/button_positive"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@*android:style/Widget.DeviceDefault.Button.Colored"
|
|
android:layout_gravity="center_vertical"
|
|
android:ellipsize="end"
|
|
android:maxLines="2"
|
|
android:maxWidth="@dimen/biometric_dialog_button_positive_max_width"
|
|
android:text="@string/biometric_dialog_confirm"
|
|
android:visibility="gone"/>
|
|
<!-- Try Again Button -->
|
|
<Button android:id="@+id/button_try_again"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@*android:style/Widget.DeviceDefault.Button.Colored"
|
|
android:layout_gravity="center_vertical"
|
|
android:ellipsize="end"
|
|
android:maxLines="2"
|
|
android:maxWidth="@dimen/biometric_dialog_button_positive_max_width"
|
|
android:text="@string/biometric_dialog_try_again"
|
|
android:visibility="gone"/>
|
|
<Space android:id="@+id/rightSpacer"
|
|
android:layout_width="8dp"
|
|
android:layout_height="match_parent"
|
|
android:visibility="visible" />
|
|
</LinearLayout>
|
|
|
|
</merge> |