From 6bace11c22ecb3746739c8e786a7dba43f0712d4 Mon Sep 17 00:00:00 2001 From: Brandon Bennett Date: Sat, 10 Nov 2012 19:21:35 -0700 Subject: Remove tabs from GNexusParts Although the tabs are pretty and shows off some of the nice features of Androud ICS/JB they are against the design guidelines. Having a tab for a single item is inefficient and it doesn't match the rest of the settings. This moves all the tabs to PreferenceCategories and have all settings on one page. Changeset 2+3+4+5: Fix whitespace and tab fail. Change-Id: I36fe8b1611ccc345ceab534b01f4dc9a97fef70c --- GNexusParts/AndroidManifest.xml | 5 - GNexusParts/res/values-de/strings.xml | 6 - GNexusParts/res/values-es/strings.xml | 7 - GNexusParts/res/values-ja/strings.xml | 6 - GNexusParts/res/values-nl/strings.xml | 3 - GNexusParts/res/values-pt/strings.xml | 4 - GNexusParts/res/values-ru/strings.xml | 7 - GNexusParts/res/values/strings.xml | 10 +- GNexusParts/res/xml/display_preferences.xml | 19 --- GNexusParts/res/xml/general_preferences.xml | 16 -- GNexusParts/res/xml/overclock_preferences.xml | 11 -- GNexusParts/res/xml/preferences.xml | 42 ++++++ .../settings/device/DevicePreferenceActivity.java | 88 +++++++++++ .../settings/device/DeviceSettings.java | 162 +-------------------- .../settings/device/DisplayFragmentActivity.java | 54 ------- .../settings/device/GeneralFragmentActivity.java | 70 --------- .../cyanogenmod/settings/device/GpuOverclock.java | 2 +- .../src/com/cyanogenmod/settings/device/Hspa.java | 2 +- .../settings/device/OverClockFragmentActivity.java | 58 -------- .../com/cyanogenmod/settings/device/Startup.java | 1 - 20 files changed, 142 insertions(+), 431 deletions(-) delete mode 100755 GNexusParts/res/xml/display_preferences.xml delete mode 100644 GNexusParts/res/xml/general_preferences.xml delete mode 100644 GNexusParts/res/xml/overclock_preferences.xml create mode 100644 GNexusParts/res/xml/preferences.xml create mode 100644 GNexusParts/src/com/cyanogenmod/settings/device/DevicePreferenceActivity.java delete mode 100755 GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java delete mode 100644 GNexusParts/src/com/cyanogenmod/settings/device/GeneralFragmentActivity.java delete mode 100644 GNexusParts/src/com/cyanogenmod/settings/device/OverClockFragmentActivity.java (limited to 'GNexusParts') 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 @@ - - - - - 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 @@ Galaxy Nexus Einstellungen - - ALLGEMEIN - BILDSCHIRM - - Prozessor - WM8994 Einstellungen ( voodoo ) Farbmultiplikator Farbmultiplikator einstellen Gammakorrektur 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 @@ Ajustes Galaxy Nexus - - GENERAL - PANTALLA - - CPU - Ajustes WM8994 ( voodoo ) Multiplicadores del color Calibrar los multiplicadores del color Gamma @@ -50,7 +44,6 @@ HSPA Habilitar HSDPA/HSUPA - GPU GPU Velocidad del procesador gráfico 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 @@ Galaxy Nexus 設定 - - 一般 - ディスプレイ - - CPU - WM8994設定 ( voodoo ) カラーマルチプライヤチューニング 画面の色味を調整する カラーガンマ調整 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 @@ --> Galaxy Nexus-instellingen - ALGEMEEN - WEERGAVE - WM8994-instellingen (voodoo) Kleurenmultiplicatoren afstemmen Kalibreer multiplicatoren van schermkleur Kleurengamma afstemmen 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 @@ Configurações Galaxy Nexus - Geral - Tela - CPU - Configurações VM8994 ( voodoo ) Ajustar Multiplicadores de Cor Calibrar multiplicadores de cor de tela Ajustar Cor Gama 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 @@ Настройки Galaxy Nexus - - ОСНОВНЫЕ - ДИСПЛЕЙ - - ЦП - Настройки WM8994 ( voodoo ) Настройка цвета мультипликатора Калибровка цвета мультипликатора Настройка цветовой гаммы @@ -49,7 +43,6 @@ Радио Включить HSDPA/HSUPA - Графический процессор Графический процессор Тактовая частота 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 @@ Galaxy Nexus Settings - - GENERAL - DISPLAY - - CPU - WM8994 Settings ( voodoo ) + Display Color Multipliers Tuning Calibrate multipliers screen color Color Gamma Tuning @@ -26,7 +21,7 @@ Values higher than 200 are not recommended DSS Gamma Set. - CPU + Hardware Vibrator feedback tuning Controls the default power of vibrator feedback @@ -50,7 +45,6 @@ HSPA Enable HSDPA/HSUPA - GPU GPU Clock Speed 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 @@ - - - - - - - - - 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 @@ - - - - - - - - - - - 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 @@ - - - - - - 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 @@ + + + + + + + + + + + + + + + + + + + + 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 mTabs = new ArrayList(); - - 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