From 8897655d2e19daffbb721188a23d3443e045df00 Mon Sep 17 00:00:00 2001
From: Steve Pfetsch <spfetsch@google.com>
Date: Wed, 20 Jan 2016 17:48:13 -0800
Subject: [PATCH] Added toast message to color temperature setting

Added a toast message to inform the user that the color temperature
setting is applied once the display is off.

Bug:26110238
Change-Id: Ia773581eb441ed2f4ac44b20e611ad3700e8abbf
---
 res/values/strings.xml                            | 7 +++++--
 src/com/android/settings/DevelopmentSettings.java | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 87f7a1f8f95..5f627ddb685 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7047,8 +7047,11 @@
     <string name="picture_color_mode_desc">Use sRGB</string>
 
     <!-- Name of the setting to change the display's color temperature -->
-    <string name="color_temperature">Display color temperature</string>
+    <string name="color_temperature">Cool color temperature</string>
 
     <!-- Description of the setting to change the display's color temperature -->
-    <string name="color_temperature_desc">Enable cool temperature</string>
+    <string name="color_temperature_desc">Use cooler display colors</string>
+
+    <!-- Toast message letting the user know the color temperature setting is not immediate -->
+    <string name="color_temperature_toast">To apply color change, turn off screen</string>
 </resources>
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4b86f986589..a3a822a6a2e 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -71,6 +71,7 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.fuelgauge.InactiveApps;
@@ -1197,6 +1198,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         SystemProperties.set(COLOR_TEMPERATURE_PROPERTY,
                 mColorTemperaturePreference.isChecked() ? "1" : "0");
         pokeSystemProperties();
+        Toast.makeText(getActivity(), R.string.color_temperature_toast, Toast.LENGTH_LONG).show();
     }
 
     private void updateUSBAudioOptions() {