Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b531c81c authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

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

parents 6aa06b96 2e7d25b9

api/17.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/content/Intent.java

+6 −0
Original line number Diff line number Diff line
@@ -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()).

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

+2 −1
Original line number Diff line number Diff line
@@ -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() {