Merge "Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into nyc-mr1-dev (c8c60f59) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -439,6 +439,22 @@ public final class Settings {
		public static final String ACTION_DISPLAY_SETTINGS =
		"android.settings.DISPLAY_SETTINGS";

		/**
		* Activity Action: Show settings to allow configuration of Night display.
		* <p>
		* In some cases, a matching Activity may not exist, so ensure you
		* safeguard against this.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_NIGHT_DISPLAY_SETTINGS =
		"android.settings.NIGHT_DISPLAY_SETTINGS";

		/**
		* Activity Action: Show settings to allow configuration of locale.
		* <p>

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ public class NightDisplayTile extends QSTile<QSTile.BooleanState>

		@Override
		public Intent getLongClickIntent() {
		return new Intent(Settings.ACTION_DISPLAY_SETTINGS);
		return new Intent(Settings.ACTION_NIGHT_DISPLAY_SETTINGS);
		}

		@Override