diff options
author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-04-16 11:27:39 +0200 |
---|---|---|
committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-04-24 23:03:22 +0200 |
commit | d6e350b33372a7cc2b1fae81281caf1338b2af94 (patch) | |
tree | e1a040e4c490e60fdde9bf35daec295253c08160 /CrespoParts | |
parent | bf0c746611b994698a4770fe233ea05ffd2ecd01 (diff) | |
download | device_samsung_crespo-d6e350b33372a7cc2b1fae81281caf1338b2af94.zip device_samsung_crespo-d6e350b33372a7cc2b1fae81281caf1338b2af94.tar.gz device_samsung_crespo-d6e350b33372a7cc2b1fae81281caf1338b2af94.tar.bz2 |
Added deepidle stats
Change-Id: I6a19d60d615658eb05a7cb7a0fc08b53fb04089f
Diffstat (limited to 'CrespoParts')
5 files changed, 166 insertions, 3 deletions
diff --git a/CrespoParts/res/layout/idle_stats_dialog.xml b/CrespoParts/res/layout/idle_stats_dialog.xml new file mode 100644 index 0000000..279bb19 --- /dev/null +++ b/CrespoParts/res/layout/idle_stats_dialog.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8"?> +<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:stretchColumns="1,2,3" + android:padding="3dip"> + + <TableRow > + + <TextView + android:layout_column="1" + android:text="@string/label_state" /> + + <TextView + android:layout_column="2" + android:gravity="right" + android:text="@string/label_time" /> + + <TextView + android:layout_column="3" + android:gravity="right" + android:text="@string/label_average" /> + </TableRow> + + <View + android:layout_height="1dip" + android:layout_marginBottom="3dip" + android:background="#FF909090" /> + + <TableRow > + + <TextView + android:layout_column="1" + android:text="@string/label_idle1" /> + + <TextView + android:layout_column="2" + android:gravity="right" + android:id="@+id/time1" + android:text="@+id/time1" /> + + <TextView + android:layout_column="3" + android:gravity="right" + android:id="@+id/avg1" + android:text="@+id/avg1" /> + </TableRow> + + <TableRow > + + <TextView + android:layout_column="1" + android:text="@string/label_idle2" /> + + <TextView + android:layout_column="2" + android:gravity="right" + android:id="@+id/time2" + android:text="@+id/time2" /> + + <TextView + android:layout_column="3" + android:gravity="right" + android:id="@+id/avg2" + android:text="@+id/avg2" /> + </TableRow> + + <TableRow > + + <TextView + android:layout_column="1" + android:text="@string/label_idle3" /> + + <TextView + android:layout_column="2" + android:gravity="right" + android:id="@+id/time3" + android:text="@+id/time3" /> + + <TextView + android:layout_column="3" + android:gravity="right" + android:id="@+id/avg3" + android:text="@+id/avg3" /> + </TableRow> + +</TableLayout> diff --git a/CrespoParts/res/values/strings.xml b/CrespoParts/res/values/strings.xml index 41abe8d..2622884 100644 --- a/CrespoParts/res/values/strings.xml +++ b/CrespoParts/res/values/strings.xml @@ -21,6 +21,9 @@ <string name="gamma_default_title">Default</string> <string name="gamma_CM_title">CM Sett.</string> <string name="gamma_bright_title">Bright Sett.</string> + <string name="color_default_title">Default</string> + <string name="color_CM_title">CM Sett.</string> + <string name="color_dark_title">Dark Sett.</string> <string name="category_touchkey_title">Touch Keys</string> <string name="touchkey_notification_title_head">Backlight Notifications</string> @@ -29,4 +32,15 @@ <string name="category_radio_title">Radio</string> <string name="hspa_title_head">HSPA</string> <string name="hspa_summary_head">Enable HSDPA/HSUPA</string> + + <string name="label_deepidle_stats">Idle Stats</string> + <string name="label_state">State</string> + <string name="label_time">Time (ms)</string> + <string name="label_average">Avg (ms)</string> + <string name="label_reset">Reset</string> + <string name="label_close">Close</string> + <string name="label_idle1">Idle</string> + <string name="label_idle2">Deep Idle (TOP=ON)</string> + <string name="label_idle3">Deep Idle (TOP=OFF)</string> + </resources> diff --git a/CrespoParts/res/xml/general_preferences.xml b/CrespoParts/res/xml/general_preferences.xml index 82c8956..423f97b 100644 --- a/CrespoParts/res/xml/general_preferences.xml +++ b/CrespoParts/res/xml/general_preferences.xml @@ -8,6 +8,10 @@ <CheckBoxPreference android:key="deepidle" android:title="@string/cpu_deepidle_title_head" android:summary="@string/cpu_deepidle_summary_head" /> + + <PreferenceScreen android:key="deepidle_stats" + android:title="@string/label_deepidle_stats" /> + </PreferenceCategory> <!-- Touch key backlight timeout --> diff --git a/CrespoParts/src/com/cyanogenmod/settings/device/DeviceSettings.java b/CrespoParts/src/com/cyanogenmod/settings/device/DeviceSettings.java index 39c9595..de26a53 100644 --- a/CrespoParts/src/com/cyanogenmod/settings/device/DeviceSettings.java +++ b/CrespoParts/src/com/cyanogenmod/settings/device/DeviceSettings.java @@ -44,6 +44,7 @@ public class DeviceSettings extends Activity { public static final String KEY_COLOR_TUNING = "color_tuning"; public static final String KEY_GAMMA_TUNING = "gamma_tuning"; public static final String KEY_DEEPIDLE = "deepidle"; + public static final String KEY_DEEPIDLE_STATS = "deepidle_stats"; public static final String KEY_NOTIFICATION = "touchkey_notification"; public static final String KEY_CATEGORY_RADIO = "category_radio"; public static final String KEY_HSPA = "hspa"; diff --git a/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java b/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java index f101de1..eb183a2 100644 --- a/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java +++ b/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java @@ -22,17 +22,25 @@ import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; +import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceActivity; import android.preference.PreferenceFragment; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; import android.util.Log; +import android.view.View; +import android.app.AlertDialog; +import android.content.DialogInterface; +import android.content.DialogInterface.OnClickListener; +import android.widget.TextView; import com.cyanogenmod.settings.device.R; -public class GeneralFragmentActivity extends PreferenceFragment { +public class GeneralFragmentActivity extends PreferenceFragment implements OnPreferenceClickListener { private static final String CPU_DEEPIDLE_FILE = "/sys/class/misc/deepidle/enabled"; + private static final String CPU_DEEPIDLE_STATS = "/sys/class/misc/deepidle/idle_stats_list"; + private static final String CPU_DEEPIDLE_RESET = "/sys/class/misc/deepidle/reset_stats"; private static final String TOUCHKEY_NOTIFICATION_FILE = "/sys/class/misc/notification/enabled"; private static final String PREF_ENABLED = "1"; private static final String TAG = "CrespoParts_General"; @@ -62,6 +70,11 @@ public class GeneralFragmentActivity extends PreferenceFragment { mNotification.setEnabled(false); } + Preference p = findPreference(DeviceSettings.KEY_DEEPIDLE_STATS); + if(p != null) { + p.setOnPreferenceClickListener(this); + } + } @Override @@ -92,11 +105,55 @@ public class GeneralFragmentActivity extends PreferenceFragment { SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); if (isSupported(CPU_DEEPIDLE_FILE)) { String sDefaultValue = Utils.readOneLine(CPU_DEEPIDLE_FILE); - Utils.writeValue(CPU_DEEPIDLE_FILE, sharedPrefs.getBoolean(DeviceSettings.KEY_DEEPIDLE, PREF_ENABLED.equals(sDefaultValue))); + Utils.writeValue(CPU_DEEPIDLE_FILE, sharedPrefs.getBoolean(DeviceSettings.KEY_DEEPIDLE, + PREF_ENABLED.equals(sDefaultValue))); } if (isSupported(TOUCHKEY_NOTIFICATION_FILE)) { String sDefaultValue = Utils.readOneLine(TOUCHKEY_NOTIFICATION_FILE); - Utils.writeValue(TOUCHKEY_NOTIFICATION_FILE, sharedPrefs.getBoolean(DeviceSettings.KEY_NOTIFICATION, PREF_ENABLED.equals(sDefaultValue))); + Utils.writeValue(TOUCHKEY_NOTIFICATION_FILE, sharedPrefs.getBoolean(DeviceSettings.KEY_NOTIFICATION, + PREF_ENABLED.equals(sDefaultValue))); } } + + private void showIdleStatsDialog() { + // display dialog + final View content = getActivity().getLayoutInflater().inflate(R.layout.idle_stats_dialog, null); + + String sStatsLine = Utils.readOneLine(CPU_DEEPIDLE_STATS); + String[] sValues = sStatsLine.split(" "); + ((TextView)content.findViewById(R.id.time1)).setText(sValues[0]); + ((TextView)content.findViewById(R.id.time2)).setText(sValues[2]); + ((TextView)content.findViewById(R.id.time3)).setText(sValues[4]); + ((TextView)content.findViewById(R.id.avg1)).setText(sValues[1]); + ((TextView)content.findViewById(R.id.avg2)).setText(sValues[3]); + ((TextView)content.findViewById(R.id.avg3)).setText(sValues[5]); + + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setTitle(getString(R.string.label_deepidle_stats)); + builder.setView(content); + builder.setPositiveButton(getString(R.string.label_reset), new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Utils.writeValue(CPU_DEEPIDLE_RESET, "1"); + dialog.dismiss(); + } + }); + builder.setNegativeButton(getString(R.string.label_close), new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + } + }); + builder.show(); + } + + @Override + public boolean onPreferenceClick(Preference preference) { + boolean ret = false; + if(preference.getKey().equals(DeviceSettings.KEY_DEEPIDLE_STATS)) { + showIdleStatsDialog(); + ret = true; + } + return ret; + } } |