Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Introduce ACTION_QUICK_CLOCK for the QS time tile." into jb-mr1-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-10-02 10:52:31 -07:00
committed by Android (Google) Code Review
parent 6aa06b969f 2e7d25b91f
commit b531c81cdb
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/17.txt
View File

@@ -5827,6 +5827,7 @@ package android.content {
field public static final java.lang.String ACTION_POWER_DISCONNECTED = "android.intent.action.ACTION_POWER_DISCONNECTED";
field public static final java.lang.String ACTION_POWER_USAGE_SUMMARY = "android.intent.action.POWER_USAGE_SUMMARY";
field public static final java.lang.String ACTION_PROVIDER_CHANGED = "android.intent.action.PROVIDER_CHANGED";
field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";
field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT";
field public static final java.lang.String ACTION_RUN = "android.intent.action.RUN";
field public static final java.lang.String ACTION_SCREEN_OFF = "android.intent.action.SCREEN_OFF";

1
api/current.txt
View File

@@ -5832,6 +5832,7 @@ package android.content {
field public static final java.lang.String ACTION_POWER_DISCONNECTED = "android.intent.action.ACTION_POWER_DISCONNECTED";
field public static final java.lang.String ACTION_POWER_USAGE_SUMMARY = "android.intent.action.POWER_USAGE_SUMMARY";
field public static final java.lang.String ACTION_PROVIDER_CHANGED = "android.intent.action.PROVIDER_CHANGED";
field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";
field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT";
field public static final java.lang.String ACTION_RUN = "android.intent.action.RUN";
field public static final java.lang.String ACTION_SCREEN_OFF = "android.intent.action.SCREEN_OFF";

6
core/java/android/content/Intent.java
View File

@@ -2414,6 +2414,12 @@ public class Intent implements Parcelable, Cloneable {
public static final String ACTION_USER_INFO_CHANGED =
"android.intent.action.USER_INFO_CHANGED";
/**
* Sent when the user taps on the clock widget in the system's "quick settings" area.
*/
public static final String ACTION_QUICK_CLOCK =
"android.intent.action.QUICK_CLOCK";
// ---------------------------------------------------------------------
// ---------------------------------------------------------------------
// Standard intent categories (see addCategory()).

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
View File

@@ -275,7 +275,8 @@ class QuickSettings {
timeTile.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
startSettingsActivity(android.provider.Settings.ACTION_DATE_SETTINGS);
// Quick. Clock. Quick. Clock. Quick. Clock.
startSettingsActivity(Intent.ACTION_QUICK_CLOCK);
}
});
mModel.addTimeTile(timeTile, new QuickSettingsModel.RefreshCallback() {