summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh Mondegarian <daneshm90@gmail.com>2013-02-01 23:59:25 -0500
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2013-02-07 15:06:09 -0800
commit1de31ed16a4b0aebbfe3ae8c4fe1e47f064125bb (patch)
treef71a27282d80e29d426c677c5a94ece44049717e
parentb71bff03495db5f3d85a3b6ffbb38ead65edb554 (diff)
downloadpackages_apps_Settings-1de31ed16a4b0aebbfe3ae8c4fe1e47f064125bb.tar.gz
packages_apps_Settings-1de31ed16a4b0aebbfe3ae8c4fe1e47f064125bb.tar.bz2
packages_apps_Settings-1de31ed16a4b0aebbfe3ae8c4fe1e47f064125bb.zip
QuietHours Tile (2/2)
Allows user to toggle state of quiet hours Change-Id: I9d3234b993d250a7d43683b51c1c3254aaec262f
-rw-r--r--AndroidManifest.xml14
-rw-r--r--res/values/strings.xml1
-rw-r--r--src/com/android/settings/Settings.java1
-rw-r--r--src/com/android/settings/cyanogenmod/QuickSettingsUtil.java4
4 files changed, 20 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 53a838d8a..bd78ce776 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1465,6 +1465,20 @@
<activity android:name=".cyanogenmod.PerformanceSettings" />
+ <activity android:name="Settings$QuietHoursSettingsActivity"
+ android:label="@string/quiet_hours_title"
+ android:taskAffinity=""
+ android:excludeFromRecents="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.cyanogenmod.QuietHours" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/sound_settings" />
+ </activity>
+
<activity android:name=".profiles.ProfilesSettings" />
<activity android:name="Settings$ProfilesSettingsActivity"
android:label="@string/profile_settings"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 93c007275..050268089 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5082,6 +5082,7 @@
<string name="title_tile_nfc">NFC</string>
<string name="title_tile_screen_timeout">Screen timeout</string>
<string name="title_tile_usb_tether">USB Tether</string>
+ <string name="title_tile_quiet_hours">Quiet hours</string>
<string name="title_dynamic_tiles">Dynamic tiles</string>
<string name="dynamic_tiles_note_title">Note</string>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index ad88aee9d..80f8468e5 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -871,4 +871,5 @@ public class Settings extends PreferenceActivity
public static class ApnSettingsActivity extends Settings { /* empty */ }
public static class ApnEditorActivity extends Settings { /* empty */ }
public static class ProfilesSettingsActivity extends Settings { /* empty */ }
+ public static class QuietHoursSettingsActivity extends Settings { /* empty */ }
}
diff --git a/src/com/android/settings/cyanogenmod/QuickSettingsUtil.java b/src/com/android/settings/cyanogenmod/QuickSettingsUtil.java
index 74c73f0b9..100dd76df 100644
--- a/src/com/android/settings/cyanogenmod/QuickSettingsUtil.java
+++ b/src/com/android/settings/cyanogenmod/QuickSettingsUtil.java
@@ -60,6 +60,7 @@ public class QuickSettingsUtil {
public static final String TILE_WIMAX = "toggleWimax";
public static final String TILE_PROFILE = "toggleProfile";
public static final String TILE_NFC = "toggleNfc";
+ public static final String TILE_QUIETHOURS = "toggleQuietHours";
private static final String TILE_DELIMITER = "|";
protected static ArrayList<String> TILES_DEFAULT = new ArrayList<String>();
@@ -118,6 +119,9 @@ public class QuickSettingsUtil {
TILES.put(TILE_PROFILE, new QuickSettingsUtil.TileInfo(
TILE_PROFILE, R.string.title_tile_profile,
"com.android.systemui:drawable/ic_qs_profiles"));
+ TILES.put(TILE_QUIETHOURS, new QuickSettingsUtil.TileInfo(
+ TILE_QUIETHOURS, R.string.title_tile_quiet_hours,
+ "com.android.systemui:drawable/ic_qs_quiet_hours_off"));
TILES.put(TILE_SETTINGS, new QuickSettingsUtil.TileInfo(
TILE_SETTINGS, R.string.title_tile_settings,
"com.android.systemui:drawable/ic_qs_settings"));