summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2014-08-22 01:18:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-22 01:18:23 +0000
commit13c3d9622fb554a2adc43f2f35dcd6a70ca3b806 (patch)
treec84bd5c24d7f2047097710313448789c1f8e7942 /core/java/android
parent8bfd36167e493a05d076dad9d361dd063886e268 (diff)
parenta557fdcfb855f3183c687d988a56f4f9ed3b0767 (diff)
downloadframeworks_base-13c3d9622fb554a2adc43f2f35dcd6a70ca3b806.zip
frameworks_base-13c3d9622fb554a2adc43f2f35dcd6a70ca3b806.tar.gz
frameworks_base-13c3d9622fb554a2adc43f2f35dcd6a70ca3b806.tar.bz2
Merge "Directly propagate Activity titles to action bars" into lmp-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/Activity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index f5ac5f7..ffcdcf7 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -5021,6 +5021,9 @@ public class Activity extends ContextThemeWrapper
}
}
}
+ if (mActionBar != null) {
+ mActionBar.setTitle(title);
+ }
}
protected void onChildTitleChanged(Activity childActivity, CharSequence title) {