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

Commit 5ff50f20 authored by Steve Pfetsch's avatar Steve Pfetsch Committed by android-build-merger
Browse files

Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev 

am: 76b29667

* commit '76b29667':
  Added toast message to color temperature setting
parents 97898c5c 76b29667

res/values/strings.xml

+5 −2
Original line number Diff line number Diff line
@@ -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>

























src/com/android/settings/DevelopmentSettings.java



+2
−0






























Original line number
Diff line number
Diff line







@@ -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() {