summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalimochoAz <calimochoazucarado@gmail.com>2012-06-03 09:20:30 +0200
committerKalimochoAz <calimochoazucarado@gmail.com>2012-06-03 09:20:30 +0200
commit859272f04cf5a5cec6fd8d2c857f606ca2fcb6a2 (patch)
tree9dd1db55142ca29b40e6ca4d07a44e827744eced
parent4e37f92683c109bdd9db3398ee6433efb778ad02 (diff)
downloaddevice_samsung_tuna-859272f04cf5a5cec6fd8d2c857f606ca2fcb6a2.zip
device_samsung_tuna-859272f04cf5a5cec6fd8d2c857f606ca2fcb6a2.tar.gz
device_samsung_tuna-859272f04cf5a5cec6fd8d2c857f606ca2fcb6a2.tar.bz2
Add controls for vibrator force
patch2: Correct caps typos and gramatical errors Change-Id: I3fe3d626ef4194b0385d7ea97b17fac88e17811b
-rw-r--r--GNexusParts/res/layout/preference_dialog_vibrator_tuning.xml50
-rw-r--r--GNexusParts/res/values/strings.xml7
-rw-r--r--GNexusParts/res/xml/general_preferences.xml10
-rw-r--r--GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java1
-rw-r--r--GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java4
-rw-r--r--GNexusParts/src/com/cyanogenmod/settings/device/Startup.java1
-rw-r--r--GNexusParts/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java266
7 files changed, 337 insertions, 2 deletions
diff --git a/GNexusParts/res/layout/preference_dialog_vibrator_tuning.xml b/GNexusParts/res/layout/preference_dialog_vibrator_tuning.xml
new file mode 100644
index 0000000..2b6e077
--- /dev/null
+++ b/GNexusParts/res/layout/preference_dialog_vibrator_tuning.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:paddingBottom="20dip">
+
+ <TextView android:id="@+id/vibrator_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/vibrator_title"
+ android:paddingTop="10dip"
+ android:paddingLeft="20dip"
+ android:paddingRight="20dip" />
+ <TextView android:id="@+id/vibrator_value"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:paddingTop="10dip"
+ android:paddingLeft="20dip"
+ android:paddingRight="20dip" />
+ <SeekBar android:id="@+id/vibrator_seekbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/vibrator_text"
+ android:paddingTop="2dip"
+ android:paddingLeft="20dip"
+ android:paddingRight="20dip" />
+
+ <LinearLayout
+ android:id="@+id/linearLayout1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/vibrator_seekbar" >
+
+ <Button
+ android:id="@+id/btnvibratorDefault"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/vibrator_default_title" />
+
+ </LinearLayout>
+
+ </RelativeLayout>
+</ScrollView>
diff --git a/GNexusParts/res/values/strings.xml b/GNexusParts/res/values/strings.xml
index 37264c0..5bc261d 100644
--- a/GNexusParts/res/values/strings.xml
+++ b/GNexusParts/res/values/strings.xml
@@ -25,6 +25,13 @@
<string name="color_dark_title">Dark Sett.</string>
<string name="gamma_dss_title">DSS Gamma Set.</string>
+ <string name="category_hardware_title">CPU</string>
+ <string name="vibrator_tuning_title_head">Vibrator feedback tuning</string>
+ <string name="vibrator_tuning_summary_head">Controls the default power of vibrator feedback</string>
+
+ <string name="vibrator_title">Vibration %</string>
+ <string name="vibrator_default_title">Default</string>
+
<string name="preset1_default_title">Default.</string>
<string name="preset2_default_title">Natural</string>
<string name="preset3_default_title">Dark Blue</string>
diff --git a/GNexusParts/res/xml/general_preferences.xml b/GNexusParts/res/xml/general_preferences.xml
index fc07c42..73c1495 100644
--- a/GNexusParts/res/xml/general_preferences.xml
+++ b/GNexusParts/res/xml/general_preferences.xml
@@ -2,8 +2,14 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<!-- General settings -->
- <PreferenceCategory android:key="category_cpu"
- android:title="@string/category_cpu_title">
+ <PreferenceCategory android:key="category_hardware"
+ android:title="@string/category_hardware_title">
+ <com.cyanogenmod.settings.device.VibratorTuningPreference
+ android:key="vibrator_tuning"
+ android:title="@string/vibrator_tuning_title_head"
+ android:summary="@string/vibrator_tuning_summary_head"
+ />
+
</PreferenceCategory>
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java b/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
index e131654..3499565 100644
--- a/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
+++ b/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
@@ -43,6 +43,7 @@ public class DeviceSettings extends Activity {
public static final String ACTION_UPDATE_PREFERENCES = "com.cyanogenmod.settings.device.UPDATE";
public static final String KEY_COLOR_TUNING = "color_tuning";
public static final String KEY_GAMMA_TUNING = "gamma_tuning";
+ public static final String KEY_VIBRATOR_TUNING = "vibrator_tuning";
public static final String KEY_CATEGORY_RADIO = "category_radio";
public static final String KEY_HSPA = "hspa";
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java b/GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java
index ca1b155..0a99c77 100644
--- a/GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java
+++ b/GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java
@@ -35,6 +35,8 @@ public class GeneralFragmentActivity extends PreferenceFragment {
private static final String PREF_ENABLED = "1";
private static final String TAG = "GNexusParts_General";
+ private VibratorTuningPreference mVibratorTuning;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -43,6 +45,8 @@ public class GeneralFragmentActivity extends PreferenceFragment {
PreferenceScreen prefSet = getPreferenceScreen();
+ mVibratorTuning = (VibratorTuningPreference) findPreference(DeviceSettings.KEY_VIBRATOR_TUNING);
+ mVibratorTuning.setEnabled(VibratorTuningPreference.isSupported());
}
@Override
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java b/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java
index 302e951..ba4aeee 100644
--- a/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java
+++ b/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java
@@ -11,6 +11,7 @@ public class Startup extends BroadcastReceiver {
ColorTuningPreference.restore(context);
GammaTuningPreference.restore(context);
GeneralFragmentActivity.restore(context);
+ VibratorTuningPreference.restore(context);
if (Hspa.isSupported()) {
Hspa.restore(context);
}
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java b/GNexusParts/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java
new file mode 100644
index 0000000..217ffec
--- /dev/null
+++ b/GNexusParts/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C) 2011 The CyanogenMod 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.cyanogenmod.settings.device;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.preference.DialogPreference;
+import android.preference.PreferenceManager;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import android.widget.Button;
+import android.util.Log;
+
+/**
+ * Special preference type that allows configuration of both the ring volume and
+ * notification volume.
+ */
+public class VibratorTuningPreference extends DialogPreference implements OnClickListener {
+
+ private static final String TAG = "vibrator...";
+
+ private static final int[] SEEKBAR_ID = new int[] {
+ R.id.vibrator_seekbar
+ };
+
+ private static final int[] VALUE_DISPLAY_ID = new int[] {
+ R.id.vibrator_value
+ };
+
+ private static final String[] FILE_PATH = new String[] {
+ "/sys/vibrator/pwmvalue",
+ };
+
+ private vibratorSeekBar mSeekBars[] = new vibratorSeekBar[1];
+
+ private static final int MAX_VALUE = 100;
+
+ private static final int OFFSET_VALUE = 0;
+
+ // Track instances to know when to restore original color
+ // (when the orientation changes, a new dialog is created before the old one
+ // is destroyed)
+ private static int sInstances = 0;
+
+ public VibratorTuningPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+
+ setDialogLayoutResource(R.layout.preference_dialog_vibrator_tuning);
+ }
+
+ @Override
+ protected void onBindDialogView(View view) {
+ super.onBindDialogView(view);
+
+ sInstances++;
+
+ for (int i = 0; i < SEEKBAR_ID.length; i++) {
+ SeekBar seekBar = (SeekBar) view.findViewById(SEEKBAR_ID[i]);
+ TextView valueDisplay = (TextView) view.findViewById(VALUE_DISPLAY_ID[i]);
+ if (i < 3)
+ mSeekBars[i] = new vibratorSeekBar(seekBar, valueDisplay, FILE_PATH[i], OFFSET_VALUE, MAX_VALUE);
+ else
+ mSeekBars[i] = new vibratorSeekBar(seekBar, valueDisplay, FILE_PATH[i], 0, 10);
+ }
+ SetupButtonClickListeners(view);
+ }
+
+ private void SetupButtonClickListeners(View view) {
+ Button mDefaultButton = (Button)view.findViewById(R.id.btnvibratorDefault);
+ mDefaultButton.setOnClickListener(this);
+ }
+
+ @Override
+ protected void onDialogClosed(boolean positiveResult) {
+ super.onDialogClosed(positiveResult);
+
+ sInstances--;
+
+ if (positiveResult) {
+ for (vibratorSeekBar csb : mSeekBars) {
+ csb.save();
+ }
+ } else if (sInstances == 0) {
+ for (vibratorSeekBar csb : mSeekBars) {
+ csb.reset();
+ }
+ }
+ }
+
+ /**
+ * Restore screen color tuning from SharedPreferences. (Write to kernel.)
+ *
+ * @param context The context to read the SharedPreferences from
+ */
+ public static void restore(Context context) {
+ if (!isSupported()) {
+ return;
+ }
+
+ SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+ Boolean bFirstTime = sharedPrefs.getBoolean("FirstTimevibrator", true);
+ for (String filePath : FILE_PATH) {
+ String sDefaultValue = Utils.readOneLine(filePath);
+ int iValue = sharedPrefs.getInt(filePath, Integer.valueOf(sDefaultValue));
+ if (bFirstTime)
+ Utils.writeValue(filePath, "127");
+ else
+ Utils.writeValue(filePath, String.valueOf((long) iValue));
+ }
+ if (bFirstTime)
+ {
+ SharedPreferences.Editor editor = sharedPrefs.edit();
+ editor.putBoolean("FirstTimevibrator", false);
+ editor.commit();
+ }
+ }
+
+ /**
+ * Check whether the running kernel supports color tuning or not.
+ *
+ * @return Whether color tuning is supported or not
+ */
+ public static boolean isSupported() {
+ boolean supported = true;
+ for (String filePath : FILE_PATH) {
+ if (!Utils.fileExists(filePath)) {
+ supported = false;
+ }
+ }
+
+ return supported;
+ }
+
+ class vibratorSeekBar implements SeekBar.OnSeekBarChangeListener {
+
+ private String mFilePath;
+
+ private int mOriginal;
+
+ private SeekBar mSeekBar;
+
+ private TextView mValueDisplay;
+
+ private int iOffset;
+
+ private int iMax;
+
+ public vibratorSeekBar(SeekBar seekBar, TextView valueDisplay, String filePath, Integer offsetValue, Integer maxValue) {
+ int iValue;
+
+ mSeekBar = seekBar;
+ mValueDisplay = valueDisplay;
+ mFilePath = filePath;
+ iOffset = offsetValue;
+ iMax = maxValue;
+
+ SharedPreferences sharedPreferences = getSharedPreferences();
+
+ // Read original value
+ if (Utils.fileExists(mFilePath)) {
+ String sDefaultValue = Utils.readOneLine(mFilePath);
+ iValue = convertVibratorToAverage(Integer.valueOf(sDefaultValue));
+ } else {
+ iValue = iMax - iOffset;
+ }
+ mOriginal = iValue;
+
+ mSeekBar.setMax(iMax);
+
+ reset();
+ mSeekBar.setOnSeekBarChangeListener(this);
+ }
+
+ public void reset() {
+ int iValue;
+
+ iValue = mOriginal + iOffset;
+ mSeekBar.setProgress(iValue);
+ updateValue(mOriginal);
+ }
+
+ public void save() {
+ int iValue;
+
+ iValue = mSeekBar.getProgress() - iOffset;
+ Editor editor = getEditor();
+ editor.putInt(mFilePath, convertAverageToVibrator(iValue));
+ editor.commit();
+ }
+
+ @Override
+ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+ int iValue;
+
+ iValue = progress - iOffset;
+ Utils.writeValue(mFilePath, String.valueOf((long) convertAverageToVibrator(iValue)));
+ updateValue(iValue);
+ }
+
+ @Override
+ public void onStartTrackingTouch(SeekBar seekBar) {
+ // Do nothing
+ }
+
+ @Override
+ public void onStopTrackingTouch(SeekBar seekBar) {
+ // Do nothing
+ }
+
+ private void updateValue(int progress) {
+ mValueDisplay.setText(String.format("%d", (int) progress));
+ }
+
+ public void setNewValue(int iValue) {
+ mOriginal = iValue;
+ reset();
+ }
+
+ private int convertAverageToVibrator(int averageValue) {
+ int resultVibrator;
+
+ resultVibrator = (averageValue * 127) / 100;
+ return resultVibrator;
+ }
+
+ private int convertVibratorToAverage(int resultVibrator) {
+ int averageValue;
+
+ averageValue = (resultVibrator * 100) / 127;
+ return resultVibrator;
+ }
+
+ }
+
+ public void onClick(View v) {
+ switch(v.getId()){
+ case R.id.btnvibratorDefault:
+ setDefaultSettings();
+ break;
+ }
+ }
+
+ private void setDefaultSettings() {
+ mSeekBars[0].setNewValue(127);
+ }
+
+}