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

Commit 55191852 authored by Romain Guy's avatar Romain Guy
Browse files

resolved conflicts for merge of bad927 to master

parents f87e8969 bad927a9

core/java/android/widget/AbsListView.java

+1 −7
Original line number Diff line number Diff line
@@ -583,13 +583,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
        boolean smoothScrollbar = a.getBoolean(R.styleable.AbsListView_smoothScrollbar, true);

        setSmoothScrollbarEnabled(smoothScrollbar);



        int defaultGestures = GESTURES_NONE;

        if (useTextFilter) {

            defaultGestures = GESTURES_FILTER;

        } else if (enableFastScroll) {

            defaultGestures = GESTURES_JUMP;

        }

        int gestures = a.getInt(R.styleable.AbsListView_gestures, defaultGestures);

        int gestures = a.getInt(R.styleable.AbsListView_gestures, GESTURES_NONE);

        setGestures(gestures);



        a.recycle();

core/res/res/values/attrs.xml

+10 −15
Original line number Diff line number Diff line
@@ -1386,12 +1386,9 @@ 
            <!-- No gesture -->

            <enum name="none" value="0" />

            <!-- Gestures jump to a specific position in the content. This requires

                  fast scroll to be enabled. If fast scroll is enabled from XML,

                  jump gestures will be enabled automatically. -->

                  fast scroll to be enabled. -->

            <enum name="jump" value="1" />

            <!-- Gestures filter the content. This requires text filtering to be enabled.

                 If text filtering is enabled from XML, filter gestures will be enabled

                 automatically. -->

            <!-- Gestures filter the content. This requires text filtering to be enabled. -->

            <enum name="filter" value="2" />

        </attr>

    </declare-styleable>
@@ -3290,7 +3287,6 @@ 
        <attr name="configure" format="string" />

    </declare-styleable>





    <!-- =============================== -->

    <!-- Accounts package class attributes -->

    <!-- =============================== -->
@@ -3316,6 +3312,5 @@ 
        <attr name="accountType"/>

    </declare-styleable>





</resources>