summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2014-12-05 11:36:08 -0800
committerDanesh M <daneshm90@gmail.com>2014-12-05 14:49:14 -0800
commite2274fc5904cc9a1b31e3c3ef2c5a681612f912f (patch)
tree862004d91ca080fa2f353916401da2c494f975e4
parent8d54acdeaf29d17a7ce808ba2dbe8166773b9ff7 (diff)
downloadandroid_packages_apps_DeskClock-e2274fc5904cc9a1b31e3c3ef2c5a681612f912f.tar.gz
android_packages_apps_DeskClock-e2274fc5904cc9a1b31e3c3ef2c5a681612f912f.tar.bz2
android_packages_apps_DeskClock-e2274fc5904cc9a1b31e3c3ef2c5a681612f912f.zip
DeskClock : Fix alarm statusbar icon visibility
Change-Id: Ib82aa6289ca6b54382b322a787f812964f191ce8
-rw-r--r--res/xml/settings.xml1
-rw-r--r--src/com/android/deskclock/SettingsActivity.java11
2 files changed, 10 insertions, 2 deletions
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index a978d4912..11ea29484 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -74,6 +74,7 @@
android:key="show_status_bar_icon"
android:title="@string/show_status_bar_icon_title"
android:summary="@string/show_status_bar_icon_summary"
+ android:persistent="false"
android:defaultValue="true" />
<ListPreference
diff --git a/src/com/android/deskclock/SettingsActivity.java b/src/com/android/deskclock/SettingsActivity.java
index 5fedd7feb..613d0bfaa 100644
--- a/src/com/android/deskclock/SettingsActivity.java
+++ b/src/com/android/deskclock/SettingsActivity.java
@@ -17,6 +17,8 @@
package com.android.deskclock;
import android.app.ActionBar;
+import android.app.AlarmManager;
+import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.content.res.Resources;
@@ -81,7 +83,7 @@ public class SettingsActivity extends PreferenceActivity
private static CharSequence[][] mTimezones;
private static Locale mLocale;
private long mTime;
-
+ private CheckBoxPreference mAlarmIcon;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -106,6 +108,10 @@ public class SettingsActivity extends PreferenceActivity
listPref.setEntries(mTimezones[1]);
listPref.setSummary(listPref.getEntry());
listPref.setOnPreferenceChangeListener(this);
+
+ mAlarmIcon = (CheckBoxPreference) findPreference(KEY_SHOW_STATUS_BAR_ICON);
+ mAlarmIcon.setChecked(Settings.System.getInt(getContentResolver(),
+ Settings.System.SHOW_ALARM_ICON, 1) == 1);
}
@Override
@@ -196,7 +202,8 @@ public class SettingsActivity extends PreferenceActivity
} else if (KEY_SHOW_STATUS_BAR_ICON.equals(pref.getKey())) {
// Check if any alarms are active. If yes and
// we allow showing the alarm icon, the icon will be shown.
- AlarmNotifications.updateStatusBarIcon(getApplicationContext(), (Boolean) newValue);
+ Settings.System.putInt(getContentResolver(), Settings.System.SHOW_ALARM_ICON,
+ (Boolean) newValue ? 1 : 0);
}
return true;
}