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

resolve merge conflicts of 259b6a8029 to master.

Browse Source 
Change-Id: I5aa772839591d6f09d672a04ab8606fd39dd4a97
This commit is contained in:
Steve Pfetsch
2016-01-22 17:43:33 -08:00
parent 239e8a895f 259b6a8029
commit f002f23f91
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

@@ -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>

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

@@ -76,6 +76,7 @@ import android.webkit.IWebViewUpdateService;
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 @@ 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() {