diff options
| author | Adam Powell <adamp@google.com> | 2011-07-28 11:58:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-28 11:58:21 -0700 |
| commit | 7c8d19d53cd48b6c748365aa6393eab2e9f09641 (patch) | |
| tree | d1c8eacb4cbbfb263a6ae0e8ad8e936acc2348d2 /api | |
| parent | a7ffaee29892cc38ae2327017b6670adafef711b (diff) | |
| parent | 88ab69780f58e4b32d497266b2ad646a4d74827b (diff) | |
| download | frameworks_base-7c8d19d53cd48b6c748365aa6393eab2e9f09641.zip frameworks_base-7c8d19d53cd48b6c748365aa6393eab2e9f09641.tar.gz frameworks_base-7c8d19d53cd48b6c748365aa6393eab2e9f09641.tar.bz2 | |
Merge "Fix bug 5087752 - Maintain correct contrast against action bars in inverse-bar themes"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index ac40096..a9c3ca0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -198,6 +198,7 @@ package android { field public static final int actionBarTabBarStyle = 16843508; // 0x10102f4 field public static final int actionBarTabStyle = 16843507; // 0x10102f3 field public static final int actionBarTabTextStyle = 16843509; // 0x10102f5 + field public static final int actionBarWidgetTheme = 16843683; // 0x10103a3 field public static final int actionButtonStyle = 16843480; // 0x10102d8 field public static final int actionDropDownStyle = 16843479; // 0x10102d7 field public static final int actionLayout = 16843515; // 0x10102fb @@ -2243,6 +2244,7 @@ package android.app { method public abstract java.lang.CharSequence getSubtitle(); method public abstract android.app.ActionBar.Tab getTabAt(int); method public abstract int getTabCount(); + method public android.content.Context getThemedContext(); method public abstract java.lang.CharSequence getTitle(); method public abstract void hide(); method public abstract boolean isShowing(); @@ -2263,7 +2265,7 @@ package android.app { method public abstract void setDisplayShowHomeEnabled(boolean); method public abstract void setDisplayShowTitleEnabled(boolean); method public abstract void setDisplayUseLogoEnabled(boolean); - method public abstract void setHomeButtonEnabled(boolean); + method public void setHomeButtonEnabled(boolean); method public abstract void setIcon(int); method public abstract void setIcon(android.graphics.drawable.Drawable); method public abstract void setListNavigationCallbacks(android.widget.SpinnerAdapter, android.app.ActionBar.OnNavigationListener); |