Settings: Tweak zen alarm info string.
Use standard styling and remove the bit about timers.
Bug:16487906
Change-Id: I28b8ac61981a2e9956d41768ee1185dc5ad950f3
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c645666..77fd6de 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5753,7 +5753,7 @@
<string name="zen_mode_from_starred">Starred contacts only</string>
<!-- [CHAR LIMIT=60] Zen mode settings: Reminder text about alarms -->
- <string name="zen_mode_alarm_info">Alarms and timers are always priority interruptions</string>
+ <string name="zen_mode_alarm_info">Alarms are always priority interruptions</string>
<!-- [CHAR LIMIT=20] Zen mode settings: When option -->
<string name="zen_mode_when">Automatically turn on</string>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 6f2fc2e..a4084cb 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -31,17 +31,25 @@
<SwitchPreference
android:key="phone_calls"
+ android:title="@string/zen_mode_phone_calls"
android:persistent="false"
android:switchTextOff=""
- android:switchTextOn=""
- android:title="@string/zen_mode_phone_calls" />
+ android:switchTextOn="" />
<SwitchPreference
android:key="messages"
+ android:title="@string/zen_mode_messages"
android:persistent="false"
android:switchTextOff=""
- android:switchTextOn=""
- android:title="@string/zen_mode_messages" />
+ android:switchTextOn="" />
+
+ <Preference
+ android:key="alarm_info"
+ android:title=""
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/colorForegroundInverse"
+ android:selectable="false"
+ android:summary="@string/zen_mode_alarm_info" />
</PreferenceCategory>
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 02bb85e..c8befa0 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -28,7 +28,6 @@
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.database.ContentObserver;
-import android.graphics.Typeface;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -45,9 +44,6 @@
import android.text.format.DateFormat;
import android.util.Log;
import android.util.SparseArray;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
import android.widget.TimePicker;
import com.android.settings.R;
@@ -72,6 +68,7 @@
private static final String KEY_CALLS = "phone_calls";
private static final String KEY_MESSAGES = "messages";
private static final String KEY_STARRED = "starred";
+ private static final String KEY_ALARM_INFO = "alarm_info";
private static final String KEY_DOWNTIME = "downtime";
private static final String KEY_DAYS = "days";
@@ -110,6 +107,7 @@
}
rt.put(R.string.zen_mode_messages, KEY_MESSAGES);
rt.put(R.string.zen_mode_from_starred, KEY_STARRED);
+ rt.put(R.string.zen_mode_alarm_info, KEY_ALARM_INFO);
rt.put(R.string.zen_mode_downtime_category, KEY_DOWNTIME);
rt.put(R.string.zen_mode_downtime_days, KEY_DAYS);
rt.put(R.string.zen_mode_start_time, KEY_START_TIME);
@@ -141,8 +139,6 @@
super.onCreate(savedInstanceState);
mContext = getActivity();
mPM = mContext.getPackageManager();
- final Resources res = mContext.getResources();
- final int padding = res.getDimensionPixelSize(R.dimen.content_margin_left);
addPreferencesFromResource(R.xml.zen_mode_settings);
final PreferenceScreen root = getPreferenceScreen();
@@ -157,6 +153,8 @@
final PreferenceCategory important =
(PreferenceCategory) root.findPreference(KEY_IMPORTANT);
+ final Preference alarmInfo = important.findPreference(KEY_ALARM_INFO);
+ important.removePreference(alarmInfo);
mCalls = (SwitchPreference) important.findPreference(KEY_CALLS);
if (Utils.isVoiceCapable(mContext)) {
@@ -213,18 +211,6 @@
});
important.addPreference(mStarred);
- final Preference alarmInfo = new Preference(mContext) {
- @Override
- public View getView(View convertView, ViewGroup parent) {
- final TextView tv = new TextView(mContext);
- tv.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.ITALIC));
- tv.setPadding(padding, padding, padding, padding);
- tv.setText(R.string.zen_mode_alarm_info);
- return tv;
- }
- };
- alarmInfo.setPersistent(false);
- alarmInfo.setSelectable(false);
important.addPreference(alarmInfo);
final PreferenceCategory downtime = (PreferenceCategory) root.findPreference(KEY_DOWNTIME);