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

am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev

Browse Source 
* commit '8a44f2c413daf544d932dbbba8f221b655da6011':
  Add color transform setting
This commit is contained in:
Justin Harrison
2015-09-19 00:46:06 +00:00
committed by Android Git Automerger
parent c62f8ea234 8a44f2c413
commit fa9d8258d4
7 changed files with 255 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
src/com/android/settings/ColorModePreference.java Normal file
View File

@@ -0,0 +1,177 @@
/*
* Copyright (C) 2015 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings;
import android.app.AlertDialog.Builder;
import android.content.Context;
import android.content.res.Resources;
import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayManager.DisplayListener;
import android.os.Handler;
import android.os.Looper;
import android.preference.DialogPreference;
import android.util.AttributeSet;
import android.view.Display;
import android.view.Display.ColorTransform;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Checkable;
import android.widget.LinearLayout;
import android.widget.TextView;
import java.util.ArrayList;
public class ColorModePreference extends DialogPreference implements
OnClickListener, DisplayListener {
private DisplayManager mDisplayManager;
private Display mDisplay;
private int mCurrentIndex;
private ArrayList<ColorTransformDescription> mDescriptions;
public ColorModePreference(Context context, AttributeSet attrs) {
super(context, attrs);
mDisplayManager = getContext().getSystemService(DisplayManager.class);
}
public int getTransformsCount() {
return mDescriptions.size();
}
public void startListening() {
mDisplayManager.registerDisplayListener(this, new Handler(Looper.getMainLooper()));
}
public void stopListening() {
mDisplayManager.unregisterDisplayListener(this);
}
@Override
public void onDisplayAdded(int displayId) {
if (displayId == Display.DEFAULT_DISPLAY) {
updateCurrentAndSupported();
}
}
@Override
public void onDisplayChanged(int displayId) {
if (displayId == Display.DEFAULT_DISPLAY) {
updateCurrentAndSupported();
}
}
@Override
public void onDisplayRemoved(int displayId) {
}
public void updateCurrentAndSupported() {
mDisplay = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
mDescriptions = new ArrayList<>();
Resources resources = getContext().getResources();
int[] transforms = resources.getIntArray(
com.android.internal.R.array.config_colorTransforms);
String[] titles = resources.getStringArray(R.array.color_mode_names);
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) {
ColorTransformDescription desc = new ColorTransformDescription();
desc.colorTransform = transforms[i];
desc.title = titles[i];
desc.summary = descriptions[i];
mDescriptions.add(desc);
}
}
// Match up a ColorTransform to every description.
ColorTransform[] supportedColorTransforms = mDisplay.getSupportedColorTransforms();
for (int i = 0; i < supportedColorTransforms.length; i++) {
for (int j = 0; j < mDescriptions.size(); j++) {
if (mDescriptions.get(j).colorTransform
== supportedColorTransforms[i].getColorTransform()
&& mDescriptions.get(j).transform == null) {
mDescriptions.get(j).transform = supportedColorTransforms[i];
break;
}
}
}
// Remove any extras that don't have a transform for some reason.
for (int i = 0; i < mDescriptions.size(); i++) {
if (mDescriptions.get(i).transform == null) {
mDescriptions.remove(i--);
}
}
ColorTransform currentTransform = mDisplay.getColorTransform();
mCurrentIndex = -1;
for (int i = 0; i < mDescriptions.size(); i++) {
if (mDescriptions.get(i).colorTransform == currentTransform.getColorTransform()) {
mCurrentIndex = i;
break;
}
}
if (mCurrentIndex != -1) {
setSummary(mDescriptions.get(mCurrentIndex).title);
} else {
setSummary(null);
}
}
@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();
mDisplay.requestColorTransform(desc.transform);
mCurrentIndex = mDescriptions.indexOf(desc);
setSummary(desc.title);
getDialog().dismiss();
}
private static class ColorTransformDescription {
private int colorTransform;
private String title;
private String summary;
private ColorTransform transform;
}
}

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

@@ -79,6 +79,7 @@ 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 static final int DLG_GLOBAL_CHANGE_WARNING = 1;
@@ -96,6 +97,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private SwitchPreference mCameraGesturePreference;
private SwitchPreference mCameraDoubleTapPowerGesturePreference;
private ColorModePreference mColorModePreference;
@Override
protected int getMetricsCategory() {
return MetricsLogger.DISPLAY;
@@ -171,6 +174,13 @@ 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);
@@ -360,6 +370,17 @@ 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();
}
}
@Override
@@ -417,6 +438,10 @@ 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() {
@@ -556,6 +581,11 @@ 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;
}
};