Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2543e6f authored by Michael Bestas's avatar Michael Bestas Committed by Michael Bestas
Browse files

Add left QS quick pulldown (2/3) 

Change-Id: I0e8c944039e5a6702bfbbcdbfbf89a3f734f37e3
parent f99ff0de

res/values/cm_arrays.xml

+13 −0
Original line number Diff line number Diff line
@@ -595,4 +595,17 @@ 
        <item>IN</item>

    </string-array>



    <!-- Quick pulldown -->

    <string-array name="status_bar_quick_qs_pulldown_entries" translatable="false">

        <item>@string/status_bar_quick_qs_pulldown_off</item>

        <item>@string/status_bar_quick_qs_pulldown_right</item>

        <item>@string/status_bar_quick_qs_pulldown_left</item>

    </string-array>



    <string-array name="status_bar_quick_qs_pulldown_values" translatable="false">

        <item>0</item>

        <item>1</item>

        <item>2</item>

    </string-array>



</resources>

res/values/cm_strings.xml

+6 −1
Original line number Diff line number Diff line
@@ -791,7 +791,12 @@ 
    <string name="status_bar_notif_count_title">Show notification count</string>

    <string name="status_bar_notif_count_summary">Display the number of pending notifications</string>

    <string name="status_bar_quick_qs_pulldown_title">Quick pulldown</string>

    <string name="status_bar_quick_qs_pulldown_summary">Right edge of the status bar pulls down Quick Settings</string>

    <string name="status_bar_quick_qs_pulldown_summary">%1$s edge of the status bar pulls down Quick Settings</string>

    <string name="status_bar_quick_qs_pulldown_summary_left">Left</string>

    <string name="status_bar_quick_qs_pulldown_summary_right">Right</string>

    <string name="status_bar_quick_qs_pulldown_off">Off</string>

    <string name="status_bar_quick_qs_pulldown_left">Left</string>

    <string name="status_bar_quick_qs_pulldown_right">Right</string>



    <!-- Status bar - Clock -->

    <string name="status_bar_clock_style_title">Clock style</string>

res/xml/status_bar_settings.xml

+5 −5
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ 
        android:summary="@string/status_bar_notif_count_summary"

        android:defaultValue="false" />



    <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference

    <ListPreference

        android:key="qs_quick_pulldown"

        android:title="@string/status_bar_quick_qs_pulldown_title"

        android:summary="@string/status_bar_quick_qs_pulldown_summary"

        android:defaultValue="true" />

        android:entries="@array/status_bar_quick_qs_pulldown_entries"

        android:entryValues="@array/status_bar_quick_qs_pulldown_values" />



</PreferenceScreen>

src/com/android/settings/cyanogenmod/StatusBarSettings.java

+30 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.os.Bundle;

import android.preference.ListPreference;

import android.preference.Preference;
@@ -51,6 +52,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
    private static final String STATUS_BAR_AM_PM = "status_bar_am_pm";

    private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";

    private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";

    private static final String STATUS_BAR_QUICK_QS_PULLDOWN = "qs_quick_pulldown";



    private static final int STATUS_BAR_BATTERY_STYLE_HIDDEN = 4;

    private static final int STATUS_BAR_BATTERY_STYLE_TEXT = 6;
@@ -59,6 +61,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
    private ListPreference mStatusBarAmPm;

    private ListPreference mStatusBarBattery;

    private ListPreference mStatusBarBatteryShowPercent;

    private ListPreference mQuickPulldown;



    @Override

    public void onCreate(Bundle icicle) {
@@ -72,6 +75,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
        mStatusBarBattery = (ListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);

        mStatusBarBatteryShowPercent =

                (ListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);

        mQuickPulldown = (ListPreference) findPreference(STATUS_BAR_QUICK_QS_PULLDOWN);



        int clockStyle = CMSettings.System.getInt(resolver,

                CMSettings.System.STATUS_BAR_CLOCK, 1);
@@ -102,6 +106,12 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
        mStatusBarBatteryShowPercent.setSummary(mStatusBarBatteryShowPercent.getEntry());

        enableStatusBarBatteryDependents(batteryStyle);

        mStatusBarBatteryShowPercent.setOnPreferenceChangeListener(this);



        int quickPulldown = CMSettings.System.getInt(resolver,

                CMSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 1);

        mQuickPulldown.setValue(String.valueOf(quickPulldown));

        updatePulldownSummary(quickPulldown);

        mQuickPulldown.setOnPreferenceChangeListener(this);

    }



    @Override
@@ -155,6 +165,12 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
            mStatusBarBatteryShowPercent.setSummary(

                    mStatusBarBatteryShowPercent.getEntries()[index]);

            return true;

        } else if (preference == mQuickPulldown) {

            int quickPulldown = Integer.valueOf((String) newValue);

            CMSettings.System.putInt(

                    resolver, CMSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN, quickPulldown);

            updatePulldownSummary(quickPulldown);

            return true;

        }

        return false;

    }
@@ -168,6 +184,20 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
        }

    }



    private void updatePulldownSummary(int value) {

        Resources res = getResources();



        if (value == 0) {

            // quick pulldown deactivated

            mQuickPulldown.setSummary(res.getString(R.string.status_bar_quick_qs_pulldown_off));

        } else {

            String direction = res.getString(value == 2

                    ? R.string.status_bar_quick_qs_pulldown_summary_left

                    : R.string.status_bar_quick_qs_pulldown_summary_right);

            mQuickPulldown.setSummary(res.getString(R.string.status_bar_quick_qs_pulldown_summary, direction));

        }

    }



    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

                @Override