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

resolved conflicts for e0d175ed to master

Browse Source 
Change-Id: Ia9f6e2f5af2ee4e5b944a80407bfedf7f9b30a1b
This commit is contained in:
Jason Monk
2015-09-23 18:55:44 -04:00
parent 4148f17616 e0d175edc6
commit 7eda07bc5f
6 changed files with 47 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -7055,4 +7055,7 @@
<!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
<string name="picture_color_mode">Picture color mode</string>
<!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
<string name="picture_color_mode_desc">Use sRGB</string>
</resources>

6
res/xml/development_prefs.xml
View File

@@ -67,6 +67,12 @@
android:entries="@array/night_mode_entries"
android:entryValues="@array/night_mode_values" />
<com.android.settings.ColorModePreference
android:key="color_mode"
android:title="@string/picture_color_mode"
android:summary="@string/picture_color_mode_desc"
android:persistent="false" />
<PreferenceCategory android:key="debug_debugging_category"
android:title="@string/debug_debugging_category">

6
res/xml/display_settings.xml
View File

@@ -103,12 +103,6 @@
android:key="auto_rotate"
android:title="@string/display_auto_rotate_title" />
<com.android.settings.ColorModePreference
android:key="color_mode"
android:title="@string/picture_color_mode"
android:persistent="false"
settings:keywords="@string/keywords_color_mode" />
<PreferenceScreen
android:key="wifi_display"
android:title="@string/wifi_display_settings_title"

46
src/com/android/settings/ColorModePreference.java
View File

@@ -23,6 +23,7 @@ import android.hardware.display.DisplayManager.DisplayListener;
import android.os.Handler;
import android.os.Looper;
import android.preference.DialogPreference;
import android.preference.SwitchPreference;
import android.util.AttributeSet;
import android.view.Display;
import android.view.Display.ColorTransform;
@@ -35,8 +36,7 @@ import android.widget.TextView;
import java.util.ArrayList;
public class ColorModePreference extends DialogPreference implements
OnClickListener, DisplayListener {
public class ColorModePreference extends SwitchPreference implements DisplayListener {
private DisplayManager mDisplayManager;
private Display mDisplay;
@@ -91,7 +91,7 @@ public class ColorModePreference extends DialogPreference implements
String[] descriptions = resources.getStringArray(R.array.color_mode_descriptions);
// Map the resource information describing color transforms.
for (int i = 0; i < transforms.length; i++) {
if (transforms[i] != -1) {
if (transforms[i] != -1 && i != 1 /* Skip Natural for now. */) {
ColorTransformDescription desc = new ColorTransformDescription();
desc.colorTransform = transforms[i];
desc.title = titles[i];
@@ -126,46 +126,20 @@ public class ColorModePreference extends DialogPreference implements
break;
}
}
if (mCurrentIndex != -1) {
setSummary(mDescriptions.get(mCurrentIndex).title);
} else {
setSummary(null);
}
setChecked(mCurrentIndex == 1);
}
@Override
protected View onCreateDialogView() {
LayoutInflater inflater = LayoutInflater.from(getContext());
LinearLayout v = (LinearLayout) inflater.inflate(R.layout.radio_list_container, null);
for (int i = 0; i < mDescriptions.size(); i++) {
View child = inflater.inflate(R.layout.radio_with_summary, v, false);
ColorTransformDescription desc = mDescriptions.get(i);
child.setTag(desc);
((TextView) child.findViewById(android.R.id.title)).setText(desc.title);
((TextView) child.findViewById(android.R.id.summary)).setText(desc.summary);
((Checkable) child).setChecked(i == mCurrentIndex);
child.setClickable(true);
child.setOnClickListener(this);
v.addView(child);
}
return v;
}
@Override
protected void onPrepareDialogBuilder(Builder builder) {
super.onPrepareDialogBuilder(builder);
builder.setPositiveButton(null, null);
}
@Override
public void onClick(View v) {
ColorTransformDescription desc = (ColorTransformDescription) v.getTag();
protected boolean persistBoolean(boolean value) {
// Right now this is a switch, so we only support two modes.
if (mDescriptions.size() == 2) {
ColorTransformDescription desc = mDescriptions.get(value ? 1 : 0);
mDisplay.requestColorTransform(desc.transform);
mCurrentIndex = mDescriptions.indexOf(desc);
}
setSummary(desc.title);
getDialog().dismiss();
return true;
}
private static class ColorTransformDescription {

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

@@ -158,6 +158,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";
private static final String WIFI_LEGACY_DHCP_CLIENT_KEY = "legacy_dhcp_client";
private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";
private static final String KEY_COLOR_MODE = "color_mode";
private static final String INACTIVE_APPS_KEY = "inactive_apps";
@@ -260,6 +261,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private DropDownPreference mNightModePreference;
private ColorModePreference mColorModePreference;
private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
private final ArrayList<SwitchPreference> mResetSwitchPrefs
@@ -435,6 +438,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
}
}
});
mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
mColorModePreference.updateCurrentAndSupported();
if (mColorModePreference.getTransformsCount() < 2) {
removePreference(KEY_COLOR_MODE);
mColorModePreference = null;
}
}
private ListPreference addListPreference(String prefKey) {
@@ -540,6 +550,19 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
setPrefsEnabledState(mLastEnabledState);
}
mSwitchBar.show();
if (mColorModePreference != null) {
mColorModePreference.startListening();
mColorModePreference.updateCurrentAndSupported();
}
}
@Override
public void onPause() {
super.onPause();
if (mColorModePreference != null) {
mColorModePreference.stopListening();
}
}
@Override

30
src/com/android/settings/DisplaySettings.java
View File

@@ -79,7 +79,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private static final String KEY_CAMERA_GESTURE = "camera_gesture";
private static final String KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE
= "camera_double_tap_power_gesture";
private static final String KEY_COLOR_MODE = "color_mode";
private DropDownPreference mFontSizePref;
@@ -95,8 +94,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private SwitchPreference mCameraGesturePreference;
private SwitchPreference mCameraDoubleTapPowerGesturePreference;
private ColorModePreference mColorModePreference;
@Override
protected int getMetricsCategory() {
return MetricsLogger.DISPLAY;
@@ -171,13 +168,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
removePreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
}
mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
mColorModePreference.updateCurrentAndSupported();
if (mColorModePreference.getTransformsCount() < 2) {
removePreference(KEY_COLOR_MODE);
mColorModePreference = null;
}
if (RotationPolicy.isRotationLockToggleVisible(activity)) {
DropDownPreference rotatePreference =
(DropDownPreference) findPreference(KEY_AUTO_ROTATE);
@@ -369,17 +359,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
public void onResume() {
super.onResume();
updateState();
if (mColorModePreference != null) {
mColorModePreference.startListening();
}
}
@Override
public void onPause() {
super.onPause();
if (mColorModePreference != null) {
mColorModePreference.stopListening();
}
}
private void updateState() {
@@ -423,10 +402,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
mCameraDoubleTapPowerGesturePreference.setChecked(value == 0);
}
if (mColorModePreference != null) {
mColorModePreference.updateCurrentAndSupported();
}
}
private void updateScreenSaverSummary() {
@@ -553,11 +528,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
if (!isCameraDoubleTapPowerGestureAvailable(context.getResources())) {
result.add(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
}
ColorModePreference pref = new ColorModePreference(context, null);
pref.updateCurrentAndSupported();
if (pref.getTransformsCount() < 2) {
result.add(KEY_COLOR_MODE);
}
return result;
}
};