PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 5ff50f2072

* commit '5ff50f2072880c76b6ad8486b5c35be9a39f9a29':
  Added toast message to color temperature setting
This commit is contained in:
Steve Pfetsch
2016-01-22 22:29:47 +00:00
committed by android-build-merger
parent bdc6074276 5ff50f2072
commit 259b6a8029
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -7047,8 +7047,11 @@
<string name="picture_color_mode_desc">Use sRGB</string> <string name="picture_color_mode_desc">Use sRGB</string>
<!-- Name of the setting to change the display's color temperature --> <!-- 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 --> <!-- 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> </resources>

2
src/com/android/settings/DevelopmentSettings.java
View File

@@ -71,6 +71,7 @@ import android.view.ViewGroup;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import android.widget.Switch; import android.widget.Switch;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.settings.fuelgauge.InactiveApps; import com.android.settings.fuelgauge.InactiveApps;
@@ -1205,6 +1206,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
SystemProperties.set(COLOR_TEMPERATURE_PROPERTY, SystemProperties.set(COLOR_TEMPERATURE_PROPERTY,
mColorTemperaturePreference.isChecked() ? "1" : "0"); mColorTemperaturePreference.isChecked() ? "1" : "0");
pokeSystemProperties(); pokeSystemProperties();
Toast.makeText(getActivity(), R.string.color_temperature_toast, Toast.LENGTH_LONG).show();
} }
private void updateUSBAudioOptions() { private void updateUSBAudioOptions() {