diff options
| author | Adam Powell <adamp@google.com> | 2014-05-14 20:13:47 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2014-05-15 15:11:40 -0700 |
| commit | 76d8f968059d27ef8500cabf7690c18552c22d5a (patch) | |
| tree | 36b1a28231cbd4813e3973a0dfdf46164d08ae47 /api | |
| parent | 0a3103e755218c1ee48c7d078892eb6b42cc2081 (diff) | |
| download | frameworks_base-76d8f968059d27ef8500cabf7690c18552c22d5a.zip frameworks_base-76d8f968059d27ef8500cabf7690c18552c22d5a.tar.gz frameworks_base-76d8f968059d27ef8500cabf7690c18552c22d5a.tar.bz2 | |
Add content insets to Toolbar
Content insets allow a Toolbar to define horizontal gridlines for the
start/end or left/right edges of major content (not counting the
navigation button or menu). This allows apps to align their layout
content above or below a Toolbar with the title and other contents of
the bar by using app-defined measurements.
Change-Id: Ibd7e0810bf81070eb5f59a42ad3257f35bc0156a
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index b7fc562..17339c9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -417,6 +417,10 @@ package android { field public static final int content = 16843355; // 0x101025b field public static final int contentAuthority = 16843408; // 0x1010290 field public static final int contentDescription = 16843379; // 0x1010273 + field public static final int contentInsetEnd = 16843861; // 0x1010455 + field public static final int contentInsetLeft = 16843862; // 0x1010456 + field public static final int contentInsetRight = 16843863; // 0x1010457 + field public static final int contentInsetStart = 16843860; // 0x1010454 field public static final int controlX1 = 16843799; // 0x1010417 field public static final int controlX2 = 16843801; // 0x1010419 field public static final int controlY1 = 16843800; // 0x1010418 @@ -36952,6 +36956,10 @@ package android.widget { 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 int getContentInsetEnd(); + method public int getContentInsetLeft(); + method public int getContentInsetRight(); + method public int getContentInsetStart(); method public android.graphics.drawable.Drawable getLogo(); method public java.lang.CharSequence getLogoDescription(); method public android.view.Menu getMenu(); @@ -36960,6 +36968,8 @@ package android.widget { method public java.lang.CharSequence getTitle(); method public void inflateMenu(int); method protected void onLayout(boolean, int, int, int, int); + method public void setContentInsetsAbsolute(int, int); + method public void setContentInsetsRelative(int, int); method public void setLogo(int); method public void setLogo(android.graphics.drawable.Drawable); method public void setLogoDescription(int); |