From ba9215cbdab7d7d156c0f49eb636ff7cdc4c45d3 Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Thu, 1 Apr 2021 04:10:53 +0000 Subject: [PATCH 1/2] Revert "Only display single line for title" This reverts commit 121041cf587ac70cce5721a387c0f43a3c2e79b1. Reason for revert: Some use cases don't need single line design. see b/184108687 Fix: 184108687 Change-Id: I1d095ae198cf2fd73eef39caf93895c7d96ca7f7 --- .../android/settings/widget/FilterTouchesSwitchPreference.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java index 57218545fe4..1b4d6817bfb 100644 --- a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java +++ b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java @@ -47,7 +47,6 @@ public class FilterTouchesSwitchPreference extends SwitchPreference { @Override public void onBindViewHolder(PreferenceViewHolder holder) { - setSingleLineTitle(true); super.onBindViewHolder(holder); final View switchView = holder.findViewById(android.R.id.switch_widget); if (switchView != null) { From f7ae52bed633d407767e54e6f72bd03e636d441f Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Thu, 1 Apr 2021 13:44:26 +0800 Subject: [PATCH 2/2] Only display single line for title MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a malicious device admin app’s name includes a bunch of CRLF characters, it will cause incorrect shows and selection confusion in Settings Device admin apps listView. Test: Built the apk and saw single line title. Bug: 169936038 Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e Merged-In: I98d9a93bfdc792017124dda52a59d25a6462079e --- .../deviceadmin/DeviceAdminListPreferenceController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java index e25bb1e4fc0..ead5a5a7358 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java @@ -207,6 +207,7 @@ public class DeviceAdminListPreferenceController extends BasePreferenceControlle return true; }); pref.setOnPreferenceChangeListener((preference, newValue) -> false); + pref.setSingleLineTitle(true); } /**