From 06c0cb7acdc07344463d8b9022c69125b14adb16 Mon Sep 17 00:00:00 2001
From: Justin Klaassen <justinklaassen@google.com>
Date: Thu, 21 Jul 2016 19:22:09 -0700
Subject: [PATCH] Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS

- The ACTION_NIGHT_DISPLAY_SETTINGS action can be used to launch
  Night display settings directly.
- Updated NightDisplayTile to use ACTION_NIGHT_DISPLAY_SETTINGS.

Bug: 30291948
Change-Id: I6d912cf481f72ef5b52f53fa23942071fc795452
---
 core/java/android/provider/Settings.java         | 16 ++++++++++++++++
 .../systemui/qs/tiles/NightDisplayTile.java      |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 72420434ec7ff..da09922268f89 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -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>
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java
index 9a3549eb6a75d..2d1f753898b77 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java
@@ -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