Merge "Disable talkback for title and subtitle in BP" into udc-dev am: 7bb31ace3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22997107 Change-Id: I182029aff2894f4200ebe45ec80a70f32fd05c8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -24,6 +24,7 @@
|
|||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:marqueeRepeatLimit="1"
|
android:marqueeRepeatLimit="1"
|
||||||
android:ellipsize="marquee"
|
android:ellipsize="marquee"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
style="@style/TextAppearance.AuthCredential.Title"/>
|
style="@style/TextAppearance.AuthCredential.Title"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
@@ -34,6 +35,7 @@
|
|||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:marqueeRepeatLimit="1"
|
android:marqueeRepeatLimit="1"
|
||||||
android:ellipsize="marquee"
|
android:ellipsize="marquee"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
style="@style/TextAppearance.AuthCredential.Subtitle"/>
|
style="@style/TextAppearance.AuthCredential.Subtitle"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|||||||
@@ -741,10 +741,10 @@ public abstract class AuthBiometricView extends LinearLayout {
|
|||||||
|
|
||||||
mTitleView.setText(mPromptInfo.getTitle());
|
mTitleView.setText(mPromptInfo.getTitle());
|
||||||
|
|
||||||
//setSelected could make marguee work
|
// setSelected could make marquee work
|
||||||
mTitleView.setSelected(true);
|
mTitleView.setSelected(true);
|
||||||
mSubtitleView.setSelected(true);
|
mSubtitleView.setSelected(true);
|
||||||
//make description view become scrollable
|
// make description view become scrollable
|
||||||
mDescriptionView.setMovementMethod(new ScrollingMovementMethod());
|
mDescriptionView.setMovementMethod(new ScrollingMovementMethod());
|
||||||
|
|
||||||
if (isDeviceCredentialAllowed()) {
|
if (isDeviceCredentialAllowed()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user