summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2014-03-17 19:10:43 -0700
committerAdam Powell <adamp@google.com>2014-04-04 10:08:17 -0700
commite43340c80dc66c45edc793ecd0343774aa34d108 (patch)
tree6a3f96a7b59d7fdd5efd45bedb666371dfaef249 /api
parentfc35dfd513677ca01e8d4950ff9faa4ed19e65fe (diff)
downloadframeworks_base-e43340c80dc66c45edc793ecd0343774aa34d108.zip
frameworks_base-e43340c80dc66c45edc793ecd0343774aa34d108.tar.gz
frameworks_base-e43340c80dc66c45edc793ecd0343774aa34d108.tar.bz2
android.widget.Toolbar
Add the new Toolbar widget for use in app layouts. ActionBar can now be used as a point of control for either a traditional window decor action bar or for a Toolbar that appears inline in an Activity's layout. ToolbarActionBar is currently WIP. Change-Id: I0da093e5645840f4fd032aa34efa0ae5f1825ff2
Diffstat (limited to 'api')
-rw-r--r--api/current.txt53
1 files changed, 53 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 73cf152..5d875a0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1075,6 +1075,7 @@ package android {
field public static final int strokeOpacity = 16843812; // 0x1010424
field public static final int strokeWidth = 16843813; // 0x1010425
field public static final int subtitle = 16843473; // 0x10102d1
+ field public static final int subtitleTextAppearance = 16843834; // 0x101043a
field public static final int subtitleTextStyle = 16843513; // 0x10102f9
field public static final int subtypeExtraValue = 16843674; // 0x101039a
field public static final int subtypeId = 16843713; // 0x10103c1
@@ -1190,6 +1191,7 @@ package android {
field public static final int tintMode = 16843798; // 0x1010416
field public static final int title = 16843233; // 0x10101e1
field public static final int titleCondensed = 16843234; // 0x10101e2
+ field public static final int titleTextAppearance = 16843833; // 0x1010439
field public static final int titleTextStyle = 16843512; // 0x10102f8
field public static final int toAlpha = 16843211; // 0x10101cb
field public static final int toDegrees = 16843188; // 0x10101b4
@@ -3088,6 +3090,7 @@ package android.app {
ctor public ActionBar.LayoutParams(int);
ctor public ActionBar.LayoutParams(android.app.ActionBar.LayoutParams);
ctor public ActionBar.LayoutParams(android.view.ViewGroup.LayoutParams);
+ ctor public ActionBar.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
field public int gravity;
}
@@ -3263,6 +3266,7 @@ package android.app {
method public void reportFullyDrawn();
method public final boolean requestWindowFeature(int);
method public final void runOnUiThread(java.lang.Runnable);
+ method public void setActionBar(android.widget.Toolbar);
method public void setActivityLabelAndIcon(java.lang.CharSequence, android.graphics.Bitmap);
method public void setContentTransitionManager(android.transition.TransitionManager);
method public void setContentView(int);
@@ -32514,6 +32518,7 @@ package android.widget {
method public android.view.Menu getMenu();
method public void onConfigurationChanged(android.content.res.Configuration);
method public void onDetachedFromWindow();
+ method public void setOnMenuItemClickListener(android.widget.ActionMenuView.OnMenuItemClickListener);
}
public static class ActionMenuView.LayoutParams extends android.widget.LinearLayout.LayoutParams {
@@ -32523,6 +32528,10 @@ package android.widget {
ctor public ActionMenuView.LayoutParams(int, int);
}
+ public static abstract interface ActionMenuView.OnMenuItemClickListener {
+ method public abstract boolean onMenuItemClick(android.view.MenuItem);
+ }
+
public abstract interface Adapter {
method public abstract int getCount();
method public abstract java.lang.Object getItem(int);
@@ -34676,6 +34685,50 @@ package android.widget {
method public void setTextOn(java.lang.CharSequence);
}
+ public class Toolbar extends android.view.ViewGroup {
+ ctor public Toolbar(android.content.Context);
+ ctor public Toolbar(android.content.Context, android.util.AttributeSet);
+ ctor public Toolbar(android.content.Context, android.util.AttributeSet, int);
+ ctor public Toolbar(android.content.Context, android.util.AttributeSet, int, int);
+ method public android.graphics.drawable.Drawable getLogo();
+ method public java.lang.CharSequence getLogoDescription();
+ method public android.view.Menu getMenu();
+ method public android.graphics.drawable.Drawable getNavigationIcon();
+ method public java.lang.CharSequence getSubtitle();
+ method public java.lang.CharSequence getTitle();
+ method public void inflateMenu(int);
+ method protected void onLayout(boolean, int, int, int, int);
+ method public void setLogo(int);
+ method public void setLogo(android.graphics.drawable.Drawable);
+ method public void setLogoDescription(int);
+ method public void setLogoDescription(java.lang.CharSequence);
+ method public void setNavigationDescription(int);
+ method public void setNavigationDescription(java.lang.CharSequence);
+ method public void setNavigationIcon(int);
+ method public void setNavigationIcon(android.graphics.drawable.Drawable);
+ method public void setNavigationOnClickListener(android.view.View.OnClickListener);
+ method public void setOnMenuItemClickListener(android.widget.Toolbar.OnMenuItemClickListener);
+ method public void setSubtitle(int);
+ method public void setSubtitle(java.lang.CharSequence);
+ method public void setTitle(int);
+ method public void setTitle(java.lang.CharSequence);
+ }
+
+ public static class Toolbar.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
+ ctor public Toolbar.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public Toolbar.LayoutParams(int, int);
+ ctor public Toolbar.LayoutParams(int, int, int);
+ ctor public Toolbar.LayoutParams(int);
+ ctor public Toolbar.LayoutParams(android.widget.Toolbar.LayoutParams);
+ ctor public Toolbar.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ ctor public Toolbar.LayoutParams(android.view.ViewGroup.LayoutParams);
+ field public int gravity;
+ }
+
+ public static abstract interface Toolbar.OnMenuItemClickListener {
+ method public abstract boolean onMenuItemClick(android.view.MenuItem);
+ }
+
public deprecated class TwoLineListItem extends android.widget.RelativeLayout {
ctor public TwoLineListItem(android.content.Context);
ctor public TwoLineListItem(android.content.Context, android.util.AttributeSet);