Merge "Allow settings preference title to span over multiple lines." into oc-dev
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index d4f9d90..9f87d03 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -136,7 +136,6 @@
<declare-styleable name="DividerPreference">
<attr name="allowDividerAbove" format="boolean" />
<attr name="allowDividerBelow" format="boolean" />
- <attr name="multiLine" format="boolean" />
</declare-styleable>
<!-- For GesturePreference -->
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 8271df4..d9124c5 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -31,6 +31,7 @@
<style name="SettingsPreference">
<item name="allowDividerAbove">false</item>
<item name="allowDividerBelow">true</item>
+ <item name="singleLineTitle">false</item>
<item name="android:layout">@layout/preference_material_settings</item>
</style>
diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml
index 3ea0860..c2b77b5 100644
--- a/res/xml/enterprise_privacy_settings.xml
+++ b/res/xml/enterprise_privacy_settings.xml
@@ -28,84 +28,64 @@
<PreferenceCategory android:title="@string/enterprise_privacy_exposure_category">
<com.android.settings.DividerPreference
android:layout_height="wrap_content"
- android:title="@string/enterprise_privacy_enterprise_data"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_enterprise_data"/>
<com.android.settings.DividerPreference
- android:title="@string/enterprise_privacy_installed_packages"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_installed_packages"/>
<com.android.settings.DividerPreference
- android:title="@string/enterprise_privacy_usage_stats"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_usage_stats"/>
<com.android.settings.DividerPreference
android:key="network_logs"
- android:title="@string/enterprise_privacy_network_logs"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_network_logs"/>
<com.android.settings.DividerPreference
android:key="bug_reports"
- android:title="@string/enterprise_privacy_bug_reports"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_bug_reports"/>
<com.android.settings.DividerPreference
android:key="security_logs"
- android:title="@string/enterprise_privacy_security_logs"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_security_logs"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/enterprise_privacy_exposure_changes_category">
<com.android.settings.DividerPreference
android:key="number_enterprise_installed_packages"
- android:title="@string/enterprise_privacy_enterprise_installed_packages"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_enterprise_installed_packages"/>
<com.android.settings.DividerPreference
android:key="enterprise_privacy_number_location_access_packages"
- android:title="@string/enterprise_privacy_location_access"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_location_access"/>
<com.android.settings.DividerPreference
android:key="enterprise_privacy_number_microphone_access_packages"
- android:title="@string/enterprise_privacy_microphone_access"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_microphone_access"/>
<com.android.settings.DividerPreference
android:key="enterprise_privacy_number_camera_access_packages"
- android:title="@string/enterprise_privacy_camera_access"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_camera_access"/>
<com.android.settings.DividerPreference
android:key="number_enterprise_set_default_apps"
- android:title="@string/enterprise_privacy_enterprise_set_default_apps"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_enterprise_set_default_apps"/>
<com.android.settings.DividerPreference
- android:key="always_on_vpn_primary_user"
- settings:multiLine="true"/>
+ android:key="always_on_vpn_primary_user"/>
<com.android.settings.DividerPreference
android:key="always_on_vpn_managed_profile"
- android:title="@string/enterprise_privacy_always_on_vpn_work"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_always_on_vpn_work"/>
<com.android.settings.DividerPreference
android:key="input_method"
- android:title="@string/enterprise_privacy_input_method"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_input_method"/>
<com.android.settings.DividerPreference
android:key="global_http_proxy"
- android:title="@string/enterprise_privacy_global_http_proxy"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_global_http_proxy"/>
<com.android.settings.DividerPreference
android:key="ca_certs"
- android:title="@string/enterprise_privacy_ca_certs"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_ca_certs"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/enterprise_privacy_device_access_category">
<com.android.settings.DividerPreference
- android:title="@string/enterprise_privacy_lock_device"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_lock_device"/>
<com.android.settings.DividerPreference
- android:title="@string/enterprise_privacy_wipe_device"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_wipe_device"/>
<com.android.settings.DividerPreference
android:key="failed_password_wipe_current_user"
- android:title="@string/enterprise_privacy_failed_password_wipe_device"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_failed_password_wipe_device"/>
<com.android.settings.DividerPreference
android:key="failed_password_wipe_managed_profile"
- android:title="@string/enterprise_privacy_failed_password_wipe_work"
- settings:multiLine="true"/>
+ android:title="@string/enterprise_privacy_failed_password_wipe_work"/>
</PreferenceCategory>
</PreferenceScreen>
diff --git a/src/com/android/settings/DividerPreference.java b/src/com/android/settings/DividerPreference.java
index 5251ec3..a971091 100644
--- a/src/com/android/settings/DividerPreference.java
+++ b/src/com/android/settings/DividerPreference.java
@@ -25,7 +25,6 @@
private Boolean mAllowAbove;
private Boolean mAllowBelow;
- private Boolean mMultiLine;
public DividerPreference(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -36,9 +35,6 @@
if (a.hasValue(R.styleable.DividerPreference_allowDividerBelow)) {
mAllowBelow = a.getBoolean(R.styleable.DividerPreference_allowDividerBelow, false);
}
- if (a.hasValue(R.styleable.DividerPreference_multiLine)) {
- mMultiLine = a.getBoolean(R.styleable.DividerPreference_multiLine, false);
- }
}
public DividerPreference(Context context) {
@@ -64,12 +60,5 @@
if (mAllowBelow != null) {
holder.setDividerAllowedBelow(mAllowBelow);
}
-
- if (mMultiLine != null && mMultiLine) {
- TextView textView = (TextView)holder.findViewById(android.R.id.title);
- if (textView != null) {
- textView.setSingleLine(false);
- }
- }
}
}
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 78b9b1e..e359da6 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -165,7 +165,6 @@
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);
diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java
index 3a771bb..cf22207 100644
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ b/src/com/android/settings/widget/MasterSwitchPreference.java
@@ -36,7 +36,6 @@
private Switch mSwitch;
private boolean mChecked;
- private boolean mMultiLine;
public MasterSwitchPreference(Context context, AttributeSet attrs,
int defStyleAttr, int defStyleRes) {
@@ -81,12 +80,6 @@
if (mSwitch != null) {
mSwitch.setChecked(mChecked);
}
- if (mMultiLine) {
- TextView textView = (TextView) holder.findViewById(android.R.id.title);
- if (textView != null) {
- textView.setSingleLine(false);
- }
- }
}
public boolean isChecked() {
@@ -106,14 +99,6 @@
}
}
- public boolean isMultiLine() {
- return mMultiLine;
- }
-
- public void setMultiLine(boolean multiLine) {
- mMultiLine = multiLine;
- }
-
/**
* If admin is not null, disables the switch.
* Otherwise, keep it enabled.