Merge "Allow settings preference title to span over multiple lines." into oc-dev

2017-04-12 17:57:27 +00:00
parent 85eba52794 aa805e70ed
commit d09c7e61f4
6 changed files with 21 additions and 68 deletions
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -165,7 +165,6 @@ public class AppNotificationSettings extends NotificationSettingsBase {
                    channelPref.setKey(channel.getId());
                    channelPref.setTitle(channel.getName());
                    channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);
-                    channelPref.setMultiLine(true);
                    channelPref.setSummary(getImportanceSummary(channel.getImportance()));
                    Bundle channelArgs = new Bundle();
                    channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);