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

Commit a20df6f8 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Add overscroll effects configuration 

I has my bouncy again!
Includes Robert Burns' weight configuration from CM6

Change-Id: Ibf5960555690494d9f97f67776fbc7cc14fc92b5
parent f212f341

res/values/arrays.xml

+30 −0
Original line number Diff line number Diff line
@@ -444,4 +444,34 @@ 
        <item>2</item>

    </string-array>



    <string-array name="pref_overscroll_effect_entries">

        <item>None</item>

        <item>Edge Glow</item>

        <item>Bounce and Glow</item>

        <item>Bounce</item>

    </string-array>



    <string-array name="pref_overscroll_effect_values">

        <item>0</item>

        <item>1</item>

        <item>2</item>

        <item>3</item>

    </string-array>



    <string-array name="entries_overscroll_weight">

        <item>Extra Heavy</item>

        <item>Heavy</item>

        <item>Medium</item>

        <item>Light</item>

        <item>Extra Light</item>

    </string-array>



    <string-array name="values_overscroll_weight">

        <item>1</item>

        <item>3</item>

        <item>5</item>

        <item>7</item>

        <item>9</item>

    </string-array>



</resources>

res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@ 
    <string name="pref_pinch_reflow_title">Reflow after pinch in</string>

    <string name="pref_pinch_reflow_summary">Reflow content immediately after pinch to zoom in</string>



    <!-- User interface : Overscroll -->

    <string name="ui_overscroll_title">Overscrolling</string>

    <string name="pref_overscroll_title">Overscroll effect</string>

    <string name="pref_overscroll_summary">Choose how scrollable objects look when they overshoot</string>

    <string name="pref_overscroll_weight_title">Overscrolling weight</string>

    <string name="pref_overscroll_weight_summary">Select the weight of the scrollable objects</string>

     

    <!-- User interface : Lock Screen -->

    <string name="ui_lockscreen_title">Screen lock settings</string>

    <string name="pref_lockscreen_delay_title">Delay</string>

res/xml/ui_settings.xml

+12 −0
Original line number Diff line number Diff line
@@ -71,6 +71,18 @@ 
            android:summary="@string/pref_pinch_reflow_summary" />

    </PreferenceCategory>



    <PreferenceCategory android:title="@string/ui_overscroll_title">

        <ListPreference android:key="pref_overscroll_effect"

            android:dialogTitle="@string/pref_overscroll_title"

            android:title="@string/pref_overscroll_title" android:summary="@string/pref_overscroll_summary"

            android:entries="@array/pref_overscroll_effect_entries" android:entryValues="@array/pref_overscroll_effect_values" />

        <ListPreference android:key="pref_overscroll_weight"

            android:dialogTitle="@string/pref_overscroll_weight_title"

            android:title="@string/pref_overscroll_weight_title" android:summary="@string/pref_overscroll_weight_summary"

            android:entries="@array/entries_overscroll_weight" android:entryValues="@array/values_overscroll_weight" />



    </PreferenceCategory>



    <PreferenceCategory android:title="@string/ui_lockscreen_title">

        <!-- screen timeout delay -->

        <ListPreference android:key="pref_lockscreen_timeout_delay" android:dialogTitle="@string/pref_lockscreen_delay_title"

src/com/cyanogenmod/cmparts/activities/UIActivity.java

+31 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ public class UIActivity extends PreferenceActivity implements OnPreferenceChange 


    private static final String POWER_PROMPT_PREF = "power_dialog_prompt";



    private static final String OVERSCROLL_PREF = "pref_overscroll_effect";



    private static final String OVERSCROLL_WEIGHT_PREF = "pref_overscroll_weight";



    /* Screen Lock */

    private static final String LOCKSCREEN_TIMEOUT_DELAY_PREF = "pref_lockscreen_timeout_delay";
@@ -89,6 +93,10 @@ public class UIActivity extends PreferenceActivity implements OnPreferenceChange 


    private CheckBoxPreference mElectronBeamAnimationOff;



    private ListPreference mOverscrollPref;



    private ListPreference mOverscrollWeightPref;



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -168,6 +176,20 @@ public class UIActivity extends PreferenceActivity implements OnPreferenceChange 
                Settings.System.EXPANDED_VIEW_WIDGET, 1) == 1));

        mPowerWidgetHideOnChange.setChecked((Settings.System.getInt(getContentResolver(),

                Settings.System.EXPANDED_HIDE_ONCHANGE, 0) == 1));



        /* Overscroll Effect */

        mOverscrollPref = (ListPreference) prefSet.findPreference(OVERSCROLL_PREF);

        int overscrollEffect = Settings.System.getInt(getContentResolver(),

                Settings.System.OVERSCROLL_EFFECT, 1);

        mOverscrollPref.setValue(String.valueOf(overscrollEffect));

        mOverscrollPref.setOnPreferenceChangeListener(this);



        mOverscrollWeightPref = (ListPreference) prefSet.findPreference(OVERSCROLL_WEIGHT_PREF);

        int overscrollWeight = Settings.System.getInt(getContentResolver(), Settings.System.OVERSCROLL_WEIGHT, 5);

        mOverscrollWeightPref.setValue(String.valueOf(overscrollWeight));

        mOverscrollWeightPref.setOnPreferenceChangeListener(this);





    }



    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
@@ -252,6 +274,15 @@ public class UIActivity extends PreferenceActivity implements OnPreferenceChange 
            Settings.System.putInt(getContentResolver(),

                    Settings.System.SCREEN_LOCK_SCREENOFF_DELAY, screenOffDelay);

            return true;

        } else if (preference == mOverscrollPref) {

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

            Settings.System.putInt(getContentResolver(),

                    Settings.System.OVERSCROLL_EFFECT, overscrollEffect);

            return true;

        } else if (preference == mOverscrollWeightPref) {

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

            Settings.System.putInt(getContentResolver(), Settings.System.OVERSCROLL_WEIGHT, overscrollWeight);

            return true;

        }

        return false;

    }