Merge "Change Input Settings UI flow."
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 15495c6..1825423 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6860,10 +6860,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() {
diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java
index 1ca6928..0d327a0 100644
--- a/src/com/android/settings/users/EditUserPhotoController.java
+++ b/src/com/android/settings/users/EditUserPhotoController.java
@@ -32,6 +32,7 @@
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
+import android.os.UserManager;
import android.provider.ContactsContract.DisplayPhoto;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
@@ -95,6 +96,10 @@
showUpdatePhotoPopup();
}
});
+ final UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+ if (um.hasUserRestriction(UserManager.DISALLOW_SET_USER_ICON)) {
+ mImageView.setEnabled(false);
+ }
mNewUserPhotoBitmap = bitmap;
mNewUserPhotoDrawable = drawable;
}