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

Commit d48fed9b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename View.setTooltip/getTooltip to setTooltipText/getTooltipText"

parents 8ac2d9f2 6a944ca1

api/current.txt

+7 −5
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ package android { 
    field public static final int toYDelta = 16843209; // 0x10101c9

    field public static final int toYScale = 16843205; // 0x10101c5

    field public static final int toolbarStyle = 16843946; // 0x10104aa

    field public static final int tooltip = 16844084; // 0x1010534

    field public static final int tooltipText = 16844084; // 0x1010534

    field public static final int top = 16843182; // 0x10101ae

    field public static final int topBright = 16842955; // 0x10100cb

    field public static final int topDark = 16842951; // 0x10100c7
@@ -42907,7 +42907,7 @@ package android.view { 
    method public abstract android.view.SubMenu getSubMenu();

    method public abstract java.lang.CharSequence getTitle();

    method public abstract java.lang.CharSequence getTitleCondensed();

    method public default java.lang.CharSequence getTooltip();

    method public default java.lang.CharSequence getTooltipText();

    method public abstract boolean hasSubMenu();

    method public abstract boolean isActionViewExpanded();

    method public abstract boolean isCheckable();
@@ -42934,7 +42934,7 @@ package android.view { 
    method public abstract android.view.MenuItem setTitle(java.lang.CharSequence);

    method public abstract android.view.MenuItem setTitle(int);

    method public abstract android.view.MenuItem setTitleCondensed(java.lang.CharSequence);

    method public default android.view.MenuItem setTooltip(java.lang.CharSequence);

    method public default android.view.MenuItem setTooltipText(java.lang.CharSequence);

    method public abstract android.view.MenuItem setVisible(boolean);

    field public static final int SHOW_AS_ACTION_ALWAYS = 2; // 0x2

    field public static final int SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW = 8; // 0x8
@@ -43628,7 +43628,8 @@ package android.view { 
    method public java.lang.Object getTag(int);

    method public int getTextAlignment();

    method public int getTextDirection();

    method public final java.lang.CharSequence getTooltip();

    method public final deprecated java.lang.CharSequence getTooltip();

    method public final java.lang.CharSequence getTooltipText();

    method public final int getTop();

    method protected float getTopFadingEdgeStrength();

    method protected int getTopPaddingOffset();
@@ -43929,7 +43930,8 @@ package android.view { 
    method public void setTag(int, java.lang.Object);

    method public void setTextAlignment(int);

    method public void setTextDirection(int);

    method public final void setTooltip(java.lang.CharSequence);

    method public final deprecated void setTooltip(java.lang.CharSequence);

    method public final void setTooltipText(java.lang.CharSequence);

    method public final void setTop(int);

    method public void setTouchDelegate(android.view.TouchDelegate);

    method public final void setTransitionName(java.lang.String);

api/system-current.txt

+7 −5
Original line number Diff line number Diff line
@@ -1491,7 +1491,7 @@ package android { 
    field public static final int toYDelta = 16843209; // 0x10101c9

    field public static final int toYScale = 16843205; // 0x10101c5

    field public static final int toolbarStyle = 16843946; // 0x10104aa

    field public static final int tooltip = 16844084; // 0x1010534

    field public static final int tooltipText = 16844084; // 0x1010534

    field public static final int top = 16843182; // 0x10101ae

    field public static final int topBright = 16842955; // 0x10100cb

    field public static final int topDark = 16842951; // 0x10100c7
@@ -46170,7 +46170,7 @@ package android.view { 
    method public abstract android.view.SubMenu getSubMenu();

    method public abstract java.lang.CharSequence getTitle();

    method public abstract java.lang.CharSequence getTitleCondensed();

    method public default java.lang.CharSequence getTooltip();

    method public default java.lang.CharSequence getTooltipText();

    method public abstract boolean hasSubMenu();

    method public abstract boolean isActionViewExpanded();

    method public abstract boolean isCheckable();
@@ -46197,7 +46197,7 @@ package android.view { 
    method public abstract android.view.MenuItem setTitle(java.lang.CharSequence);

    method public abstract android.view.MenuItem setTitle(int);

    method public abstract android.view.MenuItem setTitleCondensed(java.lang.CharSequence);

    method public default android.view.MenuItem setTooltip(java.lang.CharSequence);

    method public default android.view.MenuItem setTooltipText(java.lang.CharSequence);

    method public abstract android.view.MenuItem setVisible(boolean);

    field public static final int SHOW_AS_ACTION_ALWAYS = 2; // 0x2

    field public static final int SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW = 8; // 0x8
@@ -46891,7 +46891,8 @@ package android.view { 
    method public java.lang.Object getTag(int);

    method public int getTextAlignment();

    method public int getTextDirection();

    method public final java.lang.CharSequence getTooltip();

    method public final deprecated java.lang.CharSequence getTooltip();

    method public final java.lang.CharSequence getTooltipText();

    method public final int getTop();

    method protected float getTopFadingEdgeStrength();

    method protected int getTopPaddingOffset();
@@ -47192,7 +47193,8 @@ package android.view { 
    method public void setTag(int, java.lang.Object);

    method public void setTextAlignment(int);

    method public void setTextDirection(int);

    method public final void setTooltip(java.lang.CharSequence);

    method public final deprecated void setTooltip(java.lang.CharSequence);

    method public final void setTooltipText(java.lang.CharSequence);

    method public final void setTop(int);

    method public void setTouchDelegate(android.view.TouchDelegate);

    method public final void setTransitionName(java.lang.String);

api/test-current.txt

+7 −5
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ package android { 
    field public static final int toYDelta = 16843209; // 0x10101c9

    field public static final int toYScale = 16843205; // 0x10101c5

    field public static final int toolbarStyle = 16843946; // 0x10104aa

    field public static final int tooltip = 16844084; // 0x1010534

    field public static final int tooltipText = 16844084; // 0x1010534

    field public static final int top = 16843182; // 0x10101ae

    field public static final int topBright = 16842955; // 0x10100cb

    field public static final int topDark = 16842951; // 0x10100c7
@@ -43196,7 +43196,7 @@ package android.view { 
    method public abstract android.view.SubMenu getSubMenu();

    method public abstract java.lang.CharSequence getTitle();

    method public abstract java.lang.CharSequence getTitleCondensed();

    method public default java.lang.CharSequence getTooltip();

    method public default java.lang.CharSequence getTooltipText();

    method public abstract boolean hasSubMenu();

    method public abstract boolean isActionViewExpanded();

    method public abstract boolean isCheckable();
@@ -43223,7 +43223,7 @@ package android.view { 
    method public abstract android.view.MenuItem setTitle(java.lang.CharSequence);

    method public abstract android.view.MenuItem setTitle(int);

    method public abstract android.view.MenuItem setTitleCondensed(java.lang.CharSequence);

    method public default android.view.MenuItem setTooltip(java.lang.CharSequence);

    method public default android.view.MenuItem setTooltipText(java.lang.CharSequence);

    method public abstract android.view.MenuItem setVisible(boolean);

    field public static final int SHOW_AS_ACTION_ALWAYS = 2; // 0x2

    field public static final int SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW = 8; // 0x8
@@ -43919,7 +43919,8 @@ package android.view { 
    method public java.lang.Object getTag(int);

    method public int getTextAlignment();

    method public int getTextDirection();

    method public final java.lang.CharSequence getTooltip();

    method public final deprecated java.lang.CharSequence getTooltip();

    method public final java.lang.CharSequence getTooltipText();

    method public android.view.View getTooltipView();

    method public final int getTop();

    method protected float getTopFadingEdgeStrength();
@@ -44221,7 +44222,8 @@ package android.view { 
    method public void setTag(int, java.lang.Object);

    method public void setTextAlignment(int);

    method public void setTextDirection(int);

    method public final void setTooltip(java.lang.CharSequence);

    method public final deprecated void setTooltip(java.lang.CharSequence);

    method public final void setTooltipText(java.lang.CharSequence);

    method public final void setTop(int);

    method public void setTouchDelegate(android.view.TouchDelegate);

    method public final void setTransitionName(java.lang.String);

core/java/android/app/MediaRouteButton.java

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ public class MediaRouteButton extends View { 
    @Override

    public void setContentDescription(CharSequence contentDescription) {

        super.setContentDescription(contentDescription);

        setTooltip(contentDescription);

        setTooltipText(contentDescription);

    }



    @Override

core/java/android/view/MenuInflater.java

+3 −3
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ public class MenuInflater { 
        private ActionProvider itemActionProvider;



        private CharSequence itemContentDescription;

        private CharSequence itemTooltip;

        private CharSequence itemTooltipText;



        private static final int defaultGroupId = NO_ID;

        private static final int defaultItemId = NO_ID;
@@ -429,7 +429,7 @@ public class MenuInflater { 


            itemContentDescription =

                    a.getText(com.android.internal.R.styleable.MenuItem_contentDescription);

            itemTooltip = a.getText(com.android.internal.R.styleable.MenuItem_tooltip);

            itemTooltipText = a.getText(com.android.internal.R.styleable.MenuItem_tooltipText);



            a.recycle();
@@ -495,7 +495,7 @@ public class MenuInflater { 
            }



            item.setContentDescription(itemContentDescription);

            item.setTooltip(itemTooltip);

            item.setTooltipText(itemTooltipText);

        }



        public MenuItem addItem() {