diff options
Diffstat (limited to 'GNexusParts')
20 files changed, 142 insertions, 431 deletions
diff --git a/GNexusParts/AndroidManifest.xml b/GNexusParts/AndroidManifest.xml index e8994c1..fcb7369 100644 --- a/GNexusParts/AndroidManifest.xml +++ b/GNexusParts/AndroidManifest.xml @@ -22,11 +22,6 @@ <action android:name="android.intent.action.BOOT_COMPLETED" /> </intent-filter> </receiver> - - <activity android:name=".GeneralFragmentActivity" /> - <activity android:name=".DisplayFragmentActivity" /> - <activity android:name=".SoundFragmentActivity" /> - <activity android:name=".OverClockFragmentActivity" /> </application> </manifest> diff --git a/GNexusParts/res/values-de/strings.xml b/GNexusParts/res/values-de/strings.xml index af6da0c..89d6fc3 100644 --- a/GNexusParts/res/values-de/strings.xml +++ b/GNexusParts/res/values-de/strings.xml @@ -2,12 +2,6 @@ <resources> <string name="app_name">Galaxy Nexus Einstellungen</string> - <!-- Page Headers --> - <string name="general_title">ALLGEMEIN</string> - <string name="display_title">BILDSCHIRM</string> - - <string name="category_cpu_title">Prozessor</string> - <string name="category_screen_title">WM8994 Einstellungen ( voodoo )</string> <string name="color_tuning_title_head">Farbmultiplikator</string> <string name="color_tuning_summary_head">Farbmultiplikator einstellen</string> <string name="gamma_tuning_title_head">Gammakorrektur</string> diff --git a/GNexusParts/res/values-es/strings.xml b/GNexusParts/res/values-es/strings.xml index 90eaee0..137d9f7 100644 --- a/GNexusParts/res/values-es/strings.xml +++ b/GNexusParts/res/values-es/strings.xml @@ -2,12 +2,6 @@ <resources> <string name="app_name">Ajustes Galaxy Nexus</string> - <!-- Page Headers --> - <string name="general_title">GENERAL</string> - <string name="display_title">PANTALLA</string> - - <string name="category_cpu_title">CPU</string> - <string name="category_screen_title">Ajustes WM8994 ( voodoo )</string> <string name="color_tuning_title_head">Multiplicadores del color</string> <string name="color_tuning_summary_head">Calibrar los multiplicadores del color</string> <string name="gamma_tuning_title_head">Gamma</string> @@ -50,7 +44,6 @@ <string name="hspa_title_head">HSPA</string> <string name="hspa_summary_head">Habilitar HSDPA/HSUPA</string> - <string name="category_speed_title">GPU</string> <string name="category_gpu_title">GPU</string> <string name="gpu_overclock_title">Velocidad del procesador gráfico</string> diff --git a/GNexusParts/res/values-ja/strings.xml b/GNexusParts/res/values-ja/strings.xml index 357a2d8..4fc5f26 100644 --- a/GNexusParts/res/values-ja/strings.xml +++ b/GNexusParts/res/values-ja/strings.xml @@ -2,12 +2,6 @@ <resources> <string name="app_name">Galaxy Nexus 設定</string> - <!-- Page Headers --> - <string name="general_title">一般</string> - <string name="display_title">ディスプレイ</string> - - <string name="category_cpu_title">CPU</string> - <string name="category_screen_title">WM8994設定 ( voodoo )</string> <string name="color_tuning_title_head">カラーマルチプライヤチューニング</string> <string name="color_tuning_summary_head">画面の色味を調整する</string> <string name="gamma_tuning_title_head">カラーガンマ調整</string> diff --git a/GNexusParts/res/values-nl/strings.xml b/GNexusParts/res/values-nl/strings.xml index 414f3af..0e2718f 100644 --- a/GNexusParts/res/values-nl/strings.xml +++ b/GNexusParts/res/values-nl/strings.xml @@ -15,9 +15,6 @@ --> <resources> <string name="app_name">Galaxy Nexus-instellingen</string> - <string name="general_title">ALGEMEEN</string> - <string name="display_title">WEERGAVE</string> - <string name="category_screen_title">WM8994-instellingen (voodoo)</string> <string name="color_tuning_title_head">Kleurenmultiplicatoren afstemmen</string> <string name="color_tuning_summary_head">Kalibreer multiplicatoren van schermkleur</string> <string name="gamma_tuning_title_head">Kleurengamma afstemmen</string> diff --git a/GNexusParts/res/values-pt/strings.xml b/GNexusParts/res/values-pt/strings.xml index 0ccff92..af5be55 100755 --- a/GNexusParts/res/values-pt/strings.xml +++ b/GNexusParts/res/values-pt/strings.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Configurações Galaxy Nexus</string> - <string name="general_title">Geral</string> - <string name="display_title">Tela</string> - <string name="category_cpu_title">CPU</string> - <string name="category_screen_title">Configurações VM8994 ( voodoo )</string> <string name="color_tuning_title_head">Ajustar Multiplicadores de Cor</string> <string name="color_tuning_summary_head">Calibrar multiplicadores de cor de tela</string> <string name="gamma_tuning_title_head">Ajustar Cor Gama</string> diff --git a/GNexusParts/res/values-ru/strings.xml b/GNexusParts/res/values-ru/strings.xml index cfc65a3..898c894 100644 --- a/GNexusParts/res/values-ru/strings.xml +++ b/GNexusParts/res/values-ru/strings.xml @@ -2,12 +2,6 @@ <resources> <string name="app_name">Настройки Galaxy Nexus</string> - <!-- Page Headers --> - <string name="general_title">ОСНОВНЫЕ</string> - <string name="display_title">ДИСПЛЕЙ</string> - - <string name="category_cpu_title">ЦП</string> - <string name="category_screen_title">Настройки WM8994 ( voodoo )</string> <string name="color_tuning_title_head">Настройка цвета мультипликатора</string> <string name="color_tuning_summary_head">Калибровка цвета мультипликатора</string> <string name="gamma_tuning_title_head">Настройка цветовой гаммы</string> @@ -49,7 +43,6 @@ <string name="category_radio_title">Радио</string> <string name="hspa_summary_head">Включить HSDPA/HSUPA</string> - <string name="category_speed_title">Графический процессор</string> <string name="category_gpu_title">Графический процессор</string> <string name="gpu_overclock_title">Тактовая частота</string> </resources> diff --git a/GNexusParts/res/values/strings.xml b/GNexusParts/res/values/strings.xml index 1d0f046..70c1125 100644 --- a/GNexusParts/res/values/strings.xml +++ b/GNexusParts/res/values/strings.xml @@ -2,12 +2,7 @@ <resources> <string name="app_name">Galaxy Nexus Settings</string> - <!-- Page Headers --> - <string name="general_title">GENERAL</string> - <string name="display_title">DISPLAY</string> - - <string name="category_cpu_title">CPU</string> - <string name="category_screen_title">WM8994 Settings ( voodoo )</string> + <string name="category_display_title">Display</string> <string name="color_tuning_title_head">Color Multipliers Tuning</string> <string name="color_tuning_summary_head">Calibrate multipliers screen color</string> <string name="gamma_tuning_title_head">Color Gamma Tuning</string> @@ -26,7 +21,7 @@ <string name="color_warning">Values higher than 200 are not recommended</string> <string name="gamma_dss_title">DSS Gamma Set.</string> - <string name="category_hardware_title">CPU</string> + <string name="category_hardware_title">Hardware</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> @@ -50,7 +45,6 @@ <string name="hspa_title_head">HSPA</string> <string name="hspa_summary_head">Enable HSDPA/HSUPA</string> - <string name="category_speed_title">GPU</string> <string name="category_gpu_title">GPU</string> <string name="gpu_overclock_title">Clock Speed</string> diff --git a/GNexusParts/res/xml/display_preferences.xml b/GNexusParts/res/xml/display_preferences.xml deleted file mode 100755 index 9fea40f..0000000 --- a/GNexusParts/res/xml/display_preferences.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/app_name"> - - <!-- Color tuning --> - <com.cyanogenmod.settings.device.ColorTuningPreference - android:key="color_tuning" - android:title="@string/color_tuning_title_head" - android:summary="@string/color_tuning_summary_head" /> - <com.cyanogenmod.settings.device.GammaTuningPreference - android:key="gamma_tuning" - android:title="@string/gamma_tuning_title_head" - android:summary="@string/gamma_tuning_summary_head" /> - <com.cyanogenmod.settings.device.ColorHackPresets - android:key="colorgamma_presets" - android:title="@string/color_hack_presets_title_head" - android:summary="@string/color_hack_presets_summary_head" /> - -</PreferenceScreen> diff --git a/GNexusParts/res/xml/general_preferences.xml b/GNexusParts/res/xml/general_preferences.xml deleted file mode 100644 index 73c1495..0000000 --- a/GNexusParts/res/xml/general_preferences.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - - <!-- General settings --> - <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> - -</PreferenceScreen> diff --git a/GNexusParts/res/xml/overclock_preferences.xml b/GNexusParts/res/xml/overclock_preferences.xml deleted file mode 100644 index 551275b..0000000 --- a/GNexusParts/res/xml/overclock_preferences.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - - <ListPreference - android:key="gpu_overclock" - android:title="@string/gpu_overclock_title" - android:entries="@array/gpu_overclock_entries" - android:entryValues="@array/gpu_overclock_values" - android:defaultValue="0" /> - -</PreferenceScreen> diff --git a/GNexusParts/res/xml/preferences.xml b/GNexusParts/res/xml/preferences.xml new file mode 100644 index 0000000..a71d274 --- /dev/null +++ b/GNexusParts/res/xml/preferences.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/app_name"> + + <!-- Color tuning --> + <PreferenceCategory + android:key="category_display" + android:title="@string/category_display_title" > + <com.cyanogenmod.settings.device.ColorTuningPreference + android:key="color_tuning" + android:title="@string/color_tuning_title_head" + android:summary="@string/color_tuning_summary_head" /> + <com.cyanogenmod.settings.device.GammaTuningPreference + android:key="gamma_tuning" + android:title="@string/gamma_tuning_title_head" + android:summary="@string/gamma_tuning_summary_head" /> + <com.cyanogenmod.settings.device.ColorHackPresets + android:key="colorgamma_presets" + android:title="@string/color_hack_presets_title_head" + android:summary="@string/color_hack_presets_summary_head" /> + </PreferenceCategory> + + <!-- General settings --> + <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> + + <!-- GPU --> + <PreferenceCategory android:key="category_gpu" + android:title="@string/category_gpu_title"> + <ListPreference + android:key="gpu_overclock" + android:title="@string/gpu_overclock_title" + android:entries="@array/gpu_overclock_entries" + android:entryValues="@array/gpu_overclock_values" + android:defaultValue="0" /> + </PreferenceCategory> +</PreferenceScreen> diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/DevicePreferenceActivity.java b/GNexusParts/src/com/cyanogenmod/settings/device/DevicePreferenceActivity.java new file mode 100644 index 0000000..957883b --- /dev/null +++ b/GNexusParts/src/com/cyanogenmod/settings/device/DevicePreferenceActivity.java @@ -0,0 +1,88 @@ +/* + * 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.app.ActionBar; +import android.app.ActionBar.Tab; +import android.app.ActionBar.TabListener; +import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentManager; +import android.app.FragmentTransaction; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.ServiceConnection; +import android.os.Bundle; +import android.os.IBinder; +import android.preference.ListPreference; +import android.preference.PreferenceActivity; +import android.preference.PreferenceFragment; +import android.preference.PreferenceScreen; +import android.support.v13.app.FragmentPagerAdapter; +import android.support.v4.app.FragmentActivity; +import android.support.v4.view.ViewPager; +import android.view.MenuItem; + +import com.cyanogenmod.settings.device.R; + +import java.util.ArrayList; + +public class DevicePreferenceActivity extends PreferenceFragment { + + public static final String SHARED_PREFERENCES_BASENAME = "com.cyanogenmod.settings.device"; + 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_COLORGAMMA_PRESETS = "colorgamma_presets"; + 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"; + public static final String KEY_GPU_OVERCLOCK = "gpu_overclock"; + + private ColorTuningPreference mColorTuning; + private GammaTuningPreference mGammaTuning; + private ColorHackPresets mColorHackPresets; + private VibratorTuningPreference mVibratorTuning; + private ListPreference mGpuOverclock; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.preferences); + + mColorTuning = (ColorTuningPreference) findPreference(KEY_COLOR_TUNING); + mColorTuning.setEnabled(ColorTuningPreference.isSupported()); + + mGammaTuning = (GammaTuningPreference) findPreference(KEY_GAMMA_TUNING); + mGammaTuning.setEnabled(GammaTuningPreference.isSupported()); + + mColorHackPresets = (ColorHackPresets) findPreference(KEY_COLORGAMMA_PRESETS); + mColorHackPresets.setEnabled(ColorHackPresets.isSupported()); + + mVibratorTuning = (VibratorTuningPreference) findPreference(KEY_VIBRATOR_TUNING); + mVibratorTuning.setEnabled(VibratorTuningPreference.isSupported()); + + PreferenceScreen prefSet = getPreferenceScreen(); + + mGpuOverclock = (ListPreference) findPreference(KEY_GPU_OVERCLOCK); + mGpuOverclock.setEnabled(GpuOverclock.isSupported()); + mGpuOverclock.setOnPreferenceChangeListener(new GpuOverclock()); + GpuOverclock.updateSummary(mGpuOverclock, Integer.parseInt(mGpuOverclock.getValue())); + } +} diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java b/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java index 61b9114..772e557 100644 --- a/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java +++ b/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java @@ -1,168 +1,22 @@ -/* - * 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.app.ActionBar; -import android.app.ActionBar.Tab; -import android.app.ActionBar.TabListener; import android.app.Activity; -import android.app.Fragment; -import android.app.FragmentManager; -import android.app.FragmentTransaction; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; import android.os.Bundle; -import android.os.IBinder; -import android.support.v13.app.FragmentPagerAdapter; -import android.support.v4.app.FragmentActivity; -import android.support.v4.view.ViewPager; import android.view.MenuItem; -import com.cyanogenmod.settings.device.R; - -import java.util.ArrayList; - public class DeviceSettings extends Activity { - - public static final String SHARED_PREFERENCES_BASENAME = "com.cyanogenmod.settings.device"; - 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_COLORGAMMA_PRESETS = "colorgamma_presets"; - 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"; - public static final String KEY_GPU_OVERCLOCK = "gpu_overclock"; - - ViewPager mViewPager; - TabsAdapter mTabsAdapter; - - @Override - protected void onCreate(Bundle savedInstanceState) { + @Override + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mViewPager = new ViewPager(this); - mViewPager.setId(R.id.viewPager); - setContentView(mViewPager); - - final ActionBar bar = getActionBar(); - bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); - bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_TITLE); - bar.setTitle(R.string.app_name); - bar.setDisplayHomeAsUpEnabled(true); - - mTabsAdapter = new TabsAdapter(this, mViewPager); - mTabsAdapter.addTab(bar.newTab().setText(R.string.display_title), - DisplayFragmentActivity.class, null); - mTabsAdapter.addTab(bar.newTab().setText(R.string.general_title), - GeneralFragmentActivity.class, null); - mTabsAdapter.addTab(bar.newTab().setText(R.string.category_speed_title), - OverClockFragmentActivity.class, null); - - if (savedInstanceState != null) { - bar.setSelectedNavigationItem(savedInstanceState.getInt("tab", 0)); - } - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putInt("tab", getActionBar().getSelectedNavigationIndex()); - } + ActionBar actionBar = getActionBar(); + actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_TITLE); + actionBar.setDisplayHomeAsUpEnabled(true); - public static class TabsAdapter extends FragmentPagerAdapter - implements ActionBar.TabListener, ViewPager.OnPageChangeListener { - private final Context mContext; - private final ActionBar mActionBar; - private final ViewPager mViewPager; - private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>(); - - static final class TabInfo { - private final Class<?> clss; - private final Bundle args; - - TabInfo(Class<?> _class, Bundle _args) { - clss = _class; - args = _args; - } - } - - public TabsAdapter(Activity activity, ViewPager pager) { - super(activity.getFragmentManager()); - mContext = activity; - mActionBar = activity.getActionBar(); - mViewPager = pager; - mViewPager.setAdapter(this); - mViewPager.setOnPageChangeListener(this); - } - - public void addTab(ActionBar.Tab tab, Class<?> clss, Bundle args) { - TabInfo info = new TabInfo(clss, args); - tab.setTag(info); - tab.setTabListener(this); - mTabs.add(info); - mActionBar.addTab(tab); - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mTabs.size(); - } - - @Override - public Fragment getItem(int position) { - TabInfo info = mTabs.get(position); - return Fragment.instantiate(mContext, info.clss.getName(), info.args); - } - - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - } - - @Override - public void onPageSelected(int position) { - mActionBar.setSelectedNavigationItem(position); - } - - @Override - public void onPageScrollStateChanged(int state) { - } - - @Override - public void onTabSelected(Tab tab, FragmentTransaction ft) { - Object tag = tab.getTag(); - for (int i=0; i<mTabs.size(); i++) { - if (mTabs.get(i) == tag) { - mViewPager.setCurrentItem(i); - } - } - } - - @Override - public void onTabUnselected(Tab tab, FragmentTransaction ft) { - } - - @Override - public void onTabReselected(Tab tab, FragmentTransaction ft) { - } - } + getFragmentManager().beginTransaction().replace(android.R.id.content, + new DevicePreferenceActivity()).commit(); + } @Override public boolean onOptionsItemSelected(MenuItem item) { diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java b/GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java deleted file mode 100755 index fcb7ec0..0000000 --- a/GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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.os.Bundle; -import android.preference.CheckBoxPreference; -import android.preference.Preference; -import android.preference.PreferenceActivity; -import android.preference.PreferenceFragment; -import android.preference.PreferenceManager; -import android.preference.PreferenceScreen; -import android.util.Log; - -import com.cyanogenmod.settings.device.R; - -public class DisplayFragmentActivity extends PreferenceFragment { - - private ColorTuningPreference mColorTuning; - private GammaTuningPreference mGammaTuning; - private ColorHackPresets mColorHackPresets; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.display_preferences); - - mColorTuning = (ColorTuningPreference) findPreference(DeviceSettings.KEY_COLOR_TUNING); - mColorTuning.setEnabled(ColorTuningPreference.isSupported()); - - mGammaTuning = (GammaTuningPreference) findPreference(DeviceSettings.KEY_GAMMA_TUNING); - mGammaTuning.setEnabled(GammaTuningPreference.isSupported()); - - mColorHackPresets = (ColorHackPresets) findPreference(DeviceSettings.KEY_COLORGAMMA_PRESETS); - mColorHackPresets.setEnabled(ColorHackPresets.isSupported()); - } - -} diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java b/GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java deleted file mode 100644 index 0a99c77..0000000 --- a/GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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.os.Bundle; -import android.preference.CheckBoxPreference; -import android.preference.ListPreference; -import android.preference.Preference; -import android.preference.PreferenceActivity; -import android.preference.PreferenceFragment; -import android.preference.PreferenceManager; -import android.preference.PreferenceScreen; -import android.util.Log; - -import com.cyanogenmod.settings.device.R; - -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); - - addPreferencesFromResource(R.xml.general_preferences); - - PreferenceScreen prefSet = getPreferenceScreen(); - - mVibratorTuning = (VibratorTuningPreference) findPreference(DeviceSettings.KEY_VIBRATOR_TUNING); - mVibratorTuning.setEnabled(VibratorTuningPreference.isSupported()); - } - - @Override - public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { - - String boxValue; - String key = preference.getKey(); - - Log.w(TAG, "key: " + key); - - return true; - } - - public static boolean isSupported(String FILE) { - return Utils.fileExists(FILE); - } - - public static void restore(Context context) { - SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - } -} diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/GpuOverclock.java b/GNexusParts/src/com/cyanogenmod/settings/device/GpuOverclock.java index 63a1514..9dba113 100644 --- a/GNexusParts/src/com/cyanogenmod/settings/device/GpuOverclock.java +++ b/GNexusParts/src/com/cyanogenmod/settings/device/GpuOverclock.java @@ -37,7 +37,7 @@ public class GpuOverclock implements OnPreferenceChangeListener { } SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - Utils.writeValue(FILE, sharedPrefs.getString(DeviceSettings.KEY_GPU_OVERCLOCK, "0")); + Utils.writeValue(FILE, sharedPrefs.getString(DevicePreferenceActivity.KEY_GPU_OVERCLOCK, "0")); } public boolean onPreferenceChange(Preference preference, Object newValue) { diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/Hspa.java b/GNexusParts/src/com/cyanogenmod/settings/device/Hspa.java index cc47307..d2cf641 100644 --- a/GNexusParts/src/com/cyanogenmod/settings/device/Hspa.java +++ b/GNexusParts/src/com/cyanogenmod/settings/device/Hspa.java @@ -39,7 +39,7 @@ public class Hspa implements OnPreferenceChangeListener { } SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - sendIntent(context, sharedPrefs.getString(DeviceSettings.KEY_HSPA, "23")); + sendIntent(context, sharedPrefs.getString(DevicePreferenceActivity.KEY_HSPA, "23")); } @Override diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/OverClockFragmentActivity.java b/GNexusParts/src/com/cyanogenmod/settings/device/OverClockFragmentActivity.java deleted file mode 100644 index 66be07b..0000000 --- a/GNexusParts/src/com/cyanogenmod/settings/device/OverClockFragmentActivity.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2012 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.os.Bundle; -import android.preference.ListPreference; -import android.preference.Preference; -import android.preference.PreferenceActivity; -import android.preference.PreferenceFragment; -import android.preference.PreferenceManager; -import android.preference.PreferenceScreen; -import android.util.Log; - -import com.cyanogenmod.settings.device.R; - -public class OverClockFragmentActivity extends PreferenceFragment { - - private static final String PREF_ENABLED = "1"; - private static final String TAG = "GNexParts_OverClock"; - - private ListPreference mGpuOverclock; - private ListPreference mTouchscreenClock; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.overclock_preferences); - - PreferenceScreen prefSet = getPreferenceScreen(); - - mGpuOverclock = (ListPreference) findPreference(DeviceSettings.KEY_GPU_OVERCLOCK); - mGpuOverclock.setEnabled(GpuOverclock.isSupported()); - mGpuOverclock.setOnPreferenceChangeListener(new GpuOverclock()); - GpuOverclock.updateSummary(mGpuOverclock, Integer.parseInt(mGpuOverclock.getValue())); - - } - - public static void restore(Context context) { - SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - } -} diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java b/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java index 8cca2da..f1cd2ad 100644 --- a/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java +++ b/GNexusParts/src/com/cyanogenmod/settings/device/Startup.java @@ -10,7 +10,6 @@ public class Startup extends BroadcastReceiver { public void onReceive(final Context context, final Intent bootintent) { ColorTuningPreference.restore(context); GammaTuningPreference.restore(context); - GeneralFragmentActivity.restore(context); VibratorTuningPreference.restore(context); GpuOverclock.restore(context); if (Hspa.isSupported()) { |