| commit | f7e3c27bbb030ed6bf8c58a70f554c04428d64d4 | [log] [tgz] |
|---|---|---|
| author | Heemin Seog <hseog@google.com> | Tue Aug 18 10:08:04 2020 -0700 |
| committer | Heemin Seog <hseog@google.com> | Tue Aug 18 10:30:05 2020 -0700 |
| tree | 385a683cb95b198a07ef339e29948f86b5b63074 | |
| parent | 07288895493b38d0ea0645f89a164c4a72c3296a [diff] |
Make reset network confirm page multiline Bug: 160347946 Bug: 160348325 Test: manual Change-Id: Ibbc26fa9514fb58a36e6b55608f7be79923b8e0e
diff --git a/res/xml/reset_network_confirm_fragment.xml b/res/xml/reset_network_confirm_fragment.xml index 356159d..c45d4fc 100644 --- a/res/xml/reset_network_confirm_fragment.xml +++ b/res/xml/reset_network_confirm_fragment.xml
@@ -15,9 +15,11 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res-auto" android:title="@string/reset_network_confirm_title" android:key="@string/psk_reset_network_confirm"> <Preference android:selectable="false" - android:title="@string/reset_network_confirm_desc"/> + android:title="@string/reset_network_confirm_desc" + settings:singleLineTitle="false"/> </PreferenceScreen>
diff --git a/src/com/android/car/settings/system/MasterClearAccountsPreferenceController.java b/src/com/android/car/settings/system/MasterClearAccountsPreferenceController.java index e15baaf..5297a21 100644 --- a/src/com/android/car/settings/system/MasterClearAccountsPreferenceController.java +++ b/src/com/android/car/settings/system/MasterClearAccountsPreferenceController.java
@@ -138,6 +138,7 @@ preference.setTitle(title); preference.setIcon(icon); preference.setSelectable(false); + preference.setSingleLineTitle(false); return preference; } }