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

Commit 2aba9b1e authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier... 

am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595

Merge commit '21ad6043' into kraken

* commit '21ad6043':
  Rename tab widget attributes, remove scroll barrier constant.
parents e1599d86 21ad6043

api/current.xml

+22 −22
Original line number Diff line number Diff line
@@ -7830,121 +7830,121 @@ 
 visibility="public"

>

</field>

<field name="stripEnabled"

<field name="suggestActionMsg"

 type="int"

 transient="false"

 volatile="false"

 value="16843454"

 value="16843228"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="stripLeft"

<field name="suggestActionMsgColumn"

 type="int"

 transient="false"

 volatile="false"

 value="16843452"

 value="16843229"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="stripRight"

<field name="summary"

 type="int"

 transient="false"

 volatile="false"

 value="16843453"

 value="16843241"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="suggestActionMsg"

<field name="summaryColumn"

 type="int"

 transient="false"

 volatile="false"

 value="16843228"

 value="16843426"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="suggestActionMsgColumn"

<field name="summaryOff"

 type="int"

 transient="false"

 volatile="false"

 value="16843229"

 value="16843248"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="summary"

<field name="summaryOn"

 type="int"

 transient="false"

 volatile="false"

 value="16843241"

 value="16843247"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="summaryColumn"

<field name="supportsUploading"

 type="int"

 transient="false"

 volatile="false"

 value="16843426"

 value="16843419"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="summaryOff"

<field name="syncable"

 type="int"

 transient="false"

 volatile="false"

 value="16843248"

 value="16842777"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="summaryOn"

<field name="tabStripEnabled"

 type="int"

 transient="false"

 volatile="false"

 value="16843247"

 value="16843454"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="supportsUploading"

<field name="tabStripLeft"

 type="int"

 transient="false"

 volatile="false"

 value="16843419"

 value="16843452"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="syncable"

<field name="tabStripRight"

 type="int"

 transient="false"

 volatile="false"

 value="16842777"

 value="16843453"

 static="true"

 final="true"

 deprecated="not deprecated"

core/java/android/view/HapticFeedbackConstants.java

+0 −5
Original line number Diff line number Diff line
@@ -35,11 +35,6 @@ public class HapticFeedbackConstants { 
     */

    public static final int VIRTUAL_KEY = 1;

    

    /**

     * The user has hit the barrier point while scrolling a view.

     */

    public static final int SCROLL_BARRIER = 2;

    

    /**

     * The user has pressed a soft keyboard key.

     */

core/java/android/view/View.java

+0 −8
Original line number Diff line number Diff line
@@ -8772,14 +8772,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
            clampedY = true;

        }



        // Bump the device with some haptic feedback if we're at the edge,

        // didn't start there, and the scroll is the result of a touch event.

        if (isTouchEvent &&

                ((overscrollHorizontal && clampedX && scrollX != left && scrollX != right) ||

                (overscrollVertical && clampedY && scrollY != top && scrollY != bottom))) {

            performHapticFeedback(HapticFeedbackConstants.SCROLL_BARRIER);

        }



        onOverscrolled(newScrollX, newScrollY, clampedX, clampedY);

        

        return clampedX || clampedY;

core/java/android/widget/TabWidget.java

+6 −6
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ import android.view.View.OnFocusChangeListener; 
 * called on the containing TabHost object.

 * 

 * @attr ref android.R.styleable#TabWidget_divider

 * @attr ref android.R.styleable#TabWidget_stripEnabled

 * @attr ref android.R.styleable#TabWidget_stripLeft

 * @attr ref android.R.styleable#TabWidget_stripRight

 * @attr ref android.R.styleable#TabWidget_tabStripEnabled

 * @attr ref android.R.styleable#TabWidget_tabStripLeft

 * @attr ref android.R.styleable#TabWidget_tabStripRight

 */

public class TabWidget extends LinearLayout implements OnFocusChangeListener {

    private OnTabSelectionChanged mSelectionChangedListener;
@@ -76,10 +76,10 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { 
            context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.TabWidget,

                    defStyle, 0);



        mDrawBottomStrips = a.getBoolean(R.styleable.TabWidget_stripEnabled, true);

        mDrawBottomStrips = a.getBoolean(R.styleable.TabWidget_tabStripEnabled, true);

        mDividerDrawable = a.getDrawable(R.styleable.TabWidget_divider);

        mLeftStrip = a.getDrawable(R.styleable.TabWidget_stripLeft);

        mRightStrip = a.getDrawable(R.styleable.TabWidget_stripRight);

        mLeftStrip = a.getDrawable(R.styleable.TabWidget_tabStripLeft);

        mRightStrip = a.getDrawable(R.styleable.TabWidget_tabStripRight);



        a.recycle();

core/res/res/values/attrs.xml

+3 −3
Original line number Diff line number Diff line
@@ -1874,11 +1874,11 @@ 
        <!-- Drawable used to draw the divider between tabs. -->

        <attr name="divider" />

        <!-- Determines whether the strip under the tab indicators is drawn or not. -->

        <attr name="stripEnabled" format="boolean" />

        <attr name="tabStripEnabled" format="boolean" />

        <!-- Drawable used to draw the left part of the strip underneath the tabs. -->

        <attr name="stripLeft" format="reference" />

        <attr name="tabStripLeft" format="reference" />

        <!-- Drawable used to draw the right part of the strip underneath the tabs. -->

        <attr name="stripRight" format="reference" />

        <attr name="tabStripRight" format="reference" />

    </declare-styleable>

    <declare-styleable name="TextAppearance">

        <!-- Text color. -->