resolve merge conflicts of 259b6a8029 to master.
Change-Id: I5aa772839591d6f09d672a04ab8606fd39dd4a97
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 13868dc..ed9ef4b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6841,10 +6841,13 @@
<string name="suggestion_remove">Remove</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>
<!-- Label for category for data usage [CHAR LIMIT=30] -->
<string name="usage">Usage</string>
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index b0a685c..e38efd0 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -76,6 +76,7 @@
import android.webkit.WebViewProviderInfo;
import android.widget.Switch;
import android.widget.TextView;
+import android.widget.Toast;
import com.android.internal.app.LocalePicker;
import com.android.internal.logging.MetricsLogger;
@@ -1295,6 +1296,7 @@
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() {