summaryrefslogtreecommitdiff
path: root/core/java/android/app/ActionBar.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2014-08-26 18:06:40 -0700
committerAdam Powell <adamp@google.com>2014-08-26 18:28:17 -0700
commitaf2d85973ed768e390bc2f40f255ea39cc6f6fe5 (patch)
treed9764231b50f8433e5fb58b99b3ae5fe90f74607 /core/java/android/app/ActionBar.java
parent412e4e203f9675300c1fc8aa444a49360a5423c0 (diff)
Adjust toolbar/action bar title handling
Treat activity title changes as window title changes when propagating to action bars. This gives it lower priority if a "hard" title has been set. Fix some lifecycle handling around this that previously resulted in multiple calls. Automatically detect the starting display options for a ToolbarWidgetWrapper if we're not grabbing them from styles. This prevents setTitle and friends from going totally out to lunch if constructed around a Toolbar with no starting title. Bug 17138048 Change-Id: I9f58a3d222546745c8aa873e996b8f0d52a0ad21
Diffstat (limited to 'core/java/android/app/ActionBar.java')
-rw-r--r--core/java/android/app/ActionBar.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/ActionBar.java b/core/java/android/app/ActionBar.java
index b74c8249c72c..014a7af130e0 100644
--- a/core/java/android/app/ActionBar.java
+++ b/core/java/android/app/ActionBar.java
@@ -1061,6 +1061,10 @@ public abstract class ActionBar {
return false;
}
+ /** @hide */
+ public void setWindowTitle(CharSequence title) {
+ }
+
/**
* Listener interface for ActionBar navigation events.
*