diff options
author | elektroschmock <elektroschmock78@googlemail.com> | 2012-10-28 20:32:25 +0100 |
---|---|---|
committer | elektroschmock <elektroschmock78@googlemail.com> | 2012-10-29 19:06:56 +0100 |
commit | b403ab69df89a17669fc5678248068dfbddd0733 (patch) | |
tree | 3e35a6cb52cc8390e36d58bf219fdaaad203c2b9 /CrespoParts/src/com/cyanogenmod/settings | |
parent | d5018f60871c42d88e3295dbea0fa588cdc8c4fb (diff) | |
download | device_samsung_crespo-b403ab69df89a17669fc5678248068dfbddd0733.zip device_samsung_crespo-b403ab69df89a17669fc5678248068dfbddd0733.tar.gz device_samsung_crespo-b403ab69df89a17669fc5678248068dfbddd0733.tar.bz2 |
CrespoParts: Cleanup unused strings
Patch set 1 - Removed unused strings
Make deepidle stats dependent of deepidle activated in kernel
Patch Set 2 - Reworked Idle Stats disabling. Justin White <just6979@gmail.com>
Patch set 3 - Fixed code style - removed tabs
Change-Id: Ia489a657742227f32c82dfa74237229619782d53
Diffstat (limited to 'CrespoParts/src/com/cyanogenmod/settings')
-rw-r--r-- | CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java b/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java index d437997..613bc24 100644 --- a/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java +++ b/CrespoParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java @@ -48,6 +48,7 @@ public class GeneralFragmentActivity extends PreferenceFragment implements OnPre private CheckBoxPreference mDeepIdle; private CheckBoxPreference mNotification; + private PreferenceScreen mIdleStats; private bldTuningPreference mbldTuning; @Override @@ -59,11 +60,14 @@ public class GeneralFragmentActivity extends PreferenceFragment implements OnPre PreferenceScreen prefSet = getPreferenceScreen(); mDeepIdle = (CheckBoxPreference) findPreference(DeviceSettings.KEY_DEEPIDLE); mNotification = (CheckBoxPreference) findPreference(DeviceSettings.KEY_NOTIFICATION); + mIdleStats = (PreferenceScreen) findPreference(DeviceSettings.KEY_DEEPIDLE_STATS); if (isSupported(CPU_DEEPIDLE_FILE)) { mDeepIdle.setChecked(PREF_ENABLED.equals(Utils.readOneLine(CPU_DEEPIDLE_FILE))); + mIdleStats.setOnPreferenceClickListener(this); } else { mDeepIdle.setEnabled(false); + mIdleStats.setEnabled(false); } if (isSupported(TOUCHKEY_NOTIFICATION_FILE)) { @@ -72,10 +76,6 @@ public class GeneralFragmentActivity extends PreferenceFragment implements OnPre mNotification.setEnabled(false); } - Preference p = findPreference(DeviceSettings.KEY_DEEPIDLE_STATS); - if(p != null) - p.setOnPreferenceClickListener(this); - mbldTuning = (bldTuningPreference) findPreference(DeviceSettings.KEY_BLD_TUNING); if(mbldTuning != null) mbldTuning.setEnabled(bldTuningPreference.isSupported()); @@ -120,45 +120,45 @@ public class GeneralFragmentActivity extends PreferenceFragment implements OnPre } } - private void showIdleStatsDialog() { - // display dialog - final View content = getActivity().getLayoutInflater().inflate(R.layout.idle_stats_dialog, null); + 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; - } + ((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; + } } |