diff options
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/power_widget_settings.xml | 6 | ||||
| -rw-r--r-- | res/xml/quick_settings_panel_settings.xml | 18 | ||||
| -rw-r--r-- | src/com/android/settings/cyanogenmod/QuickSettings.java | 15 |
4 files changed, 35 insertions, 10 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 07de5f1..be672e6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4905,8 +4905,6 @@ <string name="cm_sound_mode_soundVibrate">Sound + Vibrate</string> <string name="pref_flash_mode_title">Flash mode</string> <string name="expanded_haptic_feedback_title">Haptic feedback</string> - <string name="power_widget_note_title">Note</string> - <string name="power_widget_note_summary">Enabling the Power widget will disable the ability to open the Quick Settings panel with a single swipe</string> <!-- Kill app long-press back --> <string name="kill_app_longpress_back">Kill app back button</string> @@ -5031,6 +5029,10 @@ <string name="title_dynamic_ime">IME changer</string> <string name="title_dynamic_wifi">Wi-Fi display</string> + <string name="title_general">General</string> + <string name="title_quick_pulldown">Quick pulldown</string> + <string name="summary_quick_pulldown">Show Quick Settings when pulling down notification bar near the right side of the screen</string> + <!-- This exists as part of Power widget already, re-use them If Power widget is removed, re-enable these <string name="pref_ring_mode_title">Sound modes</string> diff --git a/res/xml/power_widget_settings.xml b/res/xml/power_widget_settings.xml index d8abcd8..7b464d3 100644 --- a/res/xml/power_widget_settings.xml +++ b/res/xml/power_widget_settings.xml @@ -21,12 +21,6 @@ <PreferenceCategory android:title="@string/power_widget_title"> - <Preference - style="?android:preferenceInformationStyle" - android:title="@string/power_widget_note_title" - android:summary="@string/power_widget_note_summary" - android:selectable="false" /> - <CheckBoxPreference android:key="expanded_widget" android:title="@string/title_expanded_widget" diff --git a/res/xml/quick_settings_panel_settings.xml b/res/xml/quick_settings_panel_settings.xml index ddd0a0b..ab216ff 100644 --- a/res/xml/quick_settings_panel_settings.xml +++ b/res/xml/quick_settings_panel_settings.xml @@ -19,8 +19,20 @@ android:title="@string/quick_settings_title"> <PreferenceCategory + android:key="pref_general_settings" + android:title="@string/title_general" > + + <CheckBoxPreference + android:key="quick_pulldown" + android:title="@string/title_quick_pulldown" + android:summary="@string/summary_quick_pulldown" + android:persistent="false" /> + + </PreferenceCategory> + + <PreferenceCategory android:key="static_tiles" - android:title="@string/title_static_tiles"> + android:title="@string/title_static_tiles" > <PreferenceScreen android:key="tile_picker" @@ -41,7 +53,7 @@ <PreferenceCategory android:key="pref_dynamic_tiles" - android:title="@string/title_dynamic_tiles" /> + android:title="@string/title_dynamic_tiles" > <Preference style="?android:preferenceInformationStyle" @@ -69,4 +81,6 @@ android:title="@string/title_dynamic_wifi" android:persistent="false" /> + </PreferenceCategory> + </PreferenceScreen> diff --git a/src/com/android/settings/cyanogenmod/QuickSettings.java b/src/com/android/settings/cyanogenmod/QuickSettings.java index d17843c..403e230 100644 --- a/src/com/android/settings/cyanogenmod/QuickSettings.java +++ b/src/com/android/settings/cyanogenmod/QuickSettings.java @@ -54,6 +54,7 @@ import android.widget.TextView; import com.android.internal.telephony.Phone; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.Utils; public class QuickSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener { @@ -75,11 +76,14 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe private static final String DYNAMIC_IME = "dynamic_ime"; private static final String DYNAMIC_WIFI = "dynamic_wifi"; + private static final String QUICK_PULLDOWN = "quick_pulldown"; + MultiSelectListPreference mRingMode; CheckBoxPreference mDynamicAlarm; CheckBoxPreference mDynamicBugReport; CheckBoxPreference mDynamicWifi; CheckBoxPreference mDynamicIme; + CheckBoxPreference mQuickPulldown; @Override public void onActivityCreated(Bundle savedInstanceState) { @@ -99,6 +103,13 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe mDynamicWifi = (CheckBoxPreference) prefSet.findPreference(DYNAMIC_WIFI); mDynamicWifi.setChecked(Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_WIFI, 1) == 1); + // Add the Quick Pulldown preference and disable for tablets + mQuickPulldown = (CheckBoxPreference) prefSet.findPreference(QUICK_PULLDOWN); + mQuickPulldown.setChecked(Settings.System.getInt(resolver, Settings.System.QS_QUICK_PULLDOWN, 0) == 1); + if (Utils.isTablet(getActivity())) { + mQuickPulldown.setEnabled(false); + } + // Add the ring mode mRingMode = (MultiSelectListPreference) prefSet.findPreference(EXP_RING_MODE); String storedRingMode = Settings.System.getString(getActivity() @@ -144,6 +155,10 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe Settings.System.putInt(resolver, Settings.System.QS_DYNAMIC_WIFI, mDynamicWifi.isChecked() ? 1 : 0); return true; + } else if (preference == mQuickPulldown) { + Settings.System.putInt(resolver, Settings.System.QS_QUICK_PULLDOWN, + mQuickPulldown.isChecked() ? 1 : 0); + return true; } return super.onPreferenceTreeClick(preferenceScreen, preference); } |