summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorChris Banes <chrisbanes@google.com>2015-02-23 12:30:13 +0000
committerChris Banes <chrisbanes@google.com>2015-02-27 08:56:04 +0000
commit9cc36ca1b520c06f882e84b909f3a2b75d303a06 (patch)
tree64778fc1ebedd614503fbea1e81a8dd1cf8f942b /api
parent1b4b87c2aec1ea5487e7279e92114bb1dca013b6 (diff)
downloadframeworks_base-9cc36ca1b520c06f882e84b909f3a2b75d303a06.zip
frameworks_base-9cc36ca1b520c06f882e84b909f3a2b75d303a06.tar.gz
frameworks_base-9cc36ca1b520c06f882e84b909f3a2b75d303a06.tar.bz2
MenuItem, navigation and overflow icon tinting
- iconTint and iconTintMode attrs for MenuItem, with associated setters. - navigationTint and navigationTintMode attrs for Toolbar with associated setters. - overlflowTint and overflowTintMode attrs for Toolbar with associated setters. BUG: 18126050 BUG: 19148351 BUG: 19305408 Change-Id: Ibd1fae7cdbc7a7c42809e52541fae5d8beb18e92
Diffstat (limited to 'api')
-rw-r--r--api/current.txt14
-rw-r--r--api/system-current.txt14
2 files changed, 28 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 5e9520d..58bc7b0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -664,6 +664,8 @@ package android {
field public static final int host = 16842792; // 0x1010028
field public static final int icon = 16842754; // 0x1010002
field public static final int iconPreview = 16843337; // 0x1010249
+ field public static final int iconTint = 16844000; // 0x10104e0
+ field public static final int iconTintMode = 16844001; // 0x10104e1
field public static final int iconifiedByDefault = 16843514; // 0x10102fa
field public static final int id = 16842960; // 0x10100d0
field public static final int ignoreGravity = 16843263; // 0x10101ff
@@ -873,6 +875,8 @@ package android {
field public static final int navigationContentDescription = 16843969; // 0x10104c1
field public static final int navigationIcon = 16843968; // 0x10104c0
field public static final int navigationMode = 16843471; // 0x10102cf
+ field public static final int navigationTint = 16844004; // 0x10104e4
+ field public static final int navigationTintMode = 16844005; // 0x10104e5
field public static final int negativeButtonText = 16843254; // 0x10101f6
field public static final int nestedScrollingEnabled = 16843830; // 0x1010436
field public static final int nextFocusDown = 16842980; // 0x10100e4
@@ -904,6 +908,8 @@ package android {
field public static final int overScrollFooter = 16843459; // 0x10102c3
field public static final int overScrollHeader = 16843458; // 0x10102c2
field public static final int overScrollMode = 16843457; // 0x10102c1
+ field public static final int overflowTint = 16844002; // 0x10104e2
+ field public static final int overflowTintMode = 16844003; // 0x10104e3
field public static final int overlapAnchor = 16843874; // 0x1010462
field public static final int overridesImplicitlyEnabledSubtype = 16843682; // 0x10103a2
field public static final int packageNames = 16843649; // 0x1010381
@@ -33488,6 +33494,8 @@ package android.view {
method public abstract android.view.MenuItem setEnabled(boolean);
method public abstract android.view.MenuItem setIcon(android.graphics.drawable.Drawable);
method public abstract android.view.MenuItem setIcon(int);
+ method public abstract android.view.MenuItem setIconTintList(android.content.res.ColorStateList);
+ method public abstract android.view.MenuItem setIconTintMode(android.graphics.PorterDuff.Mode);
method public abstract android.view.MenuItem setIntent(android.content.Intent);
method public abstract android.view.MenuItem setNumericShortcut(char);
method public abstract android.view.MenuItem setOnActionExpandListener(android.view.MenuItem.OnActionExpandListener);
@@ -37427,6 +37435,8 @@ package android.widget {
method public void onConfigurationChanged(android.content.res.Configuration);
method public void onDetachedFromWindow();
method public void setOnMenuItemClickListener(android.widget.ActionMenuView.OnMenuItemClickListener);
+ method public void setOverflowTintList(android.content.res.ColorStateList);
+ method public void setOverflowTintMode(android.graphics.PorterDuff.Mode);
method public void setPopupTheme(int);
method public boolean showOverflowMenu();
}
@@ -39722,7 +39732,11 @@ package android.widget {
method public void setNavigationIcon(int);
method public void setNavigationIcon(android.graphics.drawable.Drawable);
method public void setNavigationOnClickListener(android.view.View.OnClickListener);
+ method public void setNavigationTintList(android.content.res.ColorStateList);
+ method public void setNavigationTintMode(android.graphics.PorterDuff.Mode);
method public void setOnMenuItemClickListener(android.widget.Toolbar.OnMenuItemClickListener);
+ method public void setOverflowTintList(android.content.res.ColorStateList);
+ method public void setOverflowTintMode(android.graphics.PorterDuff.Mode);
method public void setPopupTheme(int);
method public void setSubtitle(int);
method public void setSubtitle(java.lang.CharSequence);
diff --git a/api/system-current.txt b/api/system-current.txt
index c8a3c0f..aa62658 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -736,6 +736,8 @@ package android {
field public static final int host = 16842792; // 0x1010028
field public static final int icon = 16842754; // 0x1010002
field public static final int iconPreview = 16843337; // 0x1010249
+ field public static final int iconTint = 16844000; // 0x10104e0
+ field public static final int iconTintMode = 16844001; // 0x10104e1
field public static final int iconifiedByDefault = 16843514; // 0x10102fa
field public static final int id = 16842960; // 0x10100d0
field public static final int ignoreGravity = 16843263; // 0x10101ff
@@ -945,6 +947,8 @@ package android {
field public static final int navigationContentDescription = 16843969; // 0x10104c1
field public static final int navigationIcon = 16843968; // 0x10104c0
field public static final int navigationMode = 16843471; // 0x10102cf
+ field public static final int navigationTint = 16844004; // 0x10104e4
+ field public static final int navigationTintMode = 16844005; // 0x10104e5
field public static final int negativeButtonText = 16843254; // 0x10101f6
field public static final int nestedScrollingEnabled = 16843830; // 0x1010436
field public static final int nextFocusDown = 16842980; // 0x10100e4
@@ -976,6 +980,8 @@ package android {
field public static final int overScrollFooter = 16843459; // 0x10102c3
field public static final int overScrollHeader = 16843458; // 0x10102c2
field public static final int overScrollMode = 16843457; // 0x10102c1
+ field public static final int overflowTint = 16844002; // 0x10104e2
+ field public static final int overflowTintMode = 16844003; // 0x10104e3
field public static final int overlapAnchor = 16843874; // 0x1010462
field public static final int overridesImplicitlyEnabledSubtype = 16843682; // 0x10103a2
field public static final int packageNames = 16843649; // 0x1010381
@@ -35649,6 +35655,8 @@ package android.view {
method public abstract android.view.MenuItem setEnabled(boolean);
method public abstract android.view.MenuItem setIcon(android.graphics.drawable.Drawable);
method public abstract android.view.MenuItem setIcon(int);
+ method public abstract android.view.MenuItem setIconTintList(android.content.res.ColorStateList);
+ method public abstract android.view.MenuItem setIconTintMode(android.graphics.PorterDuff.Mode);
method public abstract android.view.MenuItem setIntent(android.content.Intent);
method public abstract android.view.MenuItem setNumericShortcut(char);
method public abstract android.view.MenuItem setOnActionExpandListener(android.view.MenuItem.OnActionExpandListener);
@@ -39886,6 +39894,8 @@ package android.widget {
method public void onConfigurationChanged(android.content.res.Configuration);
method public void onDetachedFromWindow();
method public void setOnMenuItemClickListener(android.widget.ActionMenuView.OnMenuItemClickListener);
+ method public void setOverflowTintList(android.content.res.ColorStateList);
+ method public void setOverflowTintMode(android.graphics.PorterDuff.Mode);
method public void setPopupTheme(int);
method public boolean showOverflowMenu();
}
@@ -42181,7 +42191,11 @@ package android.widget {
method public void setNavigationIcon(int);
method public void setNavigationIcon(android.graphics.drawable.Drawable);
method public void setNavigationOnClickListener(android.view.View.OnClickListener);
+ method public void setNavigationTintList(android.content.res.ColorStateList);
+ method public void setNavigationTintMode(android.graphics.PorterDuff.Mode);
method public void setOnMenuItemClickListener(android.widget.Toolbar.OnMenuItemClickListener);
+ method public void setOverflowTintList(android.content.res.ColorStateList);
+ method public void setOverflowTintMode(android.graphics.PorterDuff.Mode);
method public void setPopupTheme(int);
method public void setSubtitle(int);
method public void setSubtitle(java.lang.CharSequence);