DO NOT MERGE Fix overwriting Action Bar title
This commit fixes the Action Bar title being overwritten by
the Activity title. The wrong method on ActionBarView was
being called from Activity.onTitleChanged(), which didn't
check to see if a title had been explicitly set.
Bug: 9569582
Change-Id: I8c03fa03fc6fe34852896841fec52a3d24c080e6
diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarActivity.java b/v7/appcompat/src/android/support/v7/app/ActionBarActivity.java
index 504ef06..dc4f6dc 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarActivity.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarActivity.java
@@ -129,7 +129,7 @@
@Override
protected void onTitleChanged(CharSequence title, int color) {
super.onTitleChanged(title, color);
- mImpl.setTitle(title);
+ mImpl.onTitleChanged(title);
}
/**
diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java
index c34d12e..5578aa2 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java
@@ -122,7 +122,7 @@
abstract void addContentView(View v, ViewGroup.LayoutParams lp);
- abstract void setTitle(CharSequence title);
+ abstract void onTitleChanged(CharSequence title);
abstract void supportInvalidateOptionsMenu();
diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateBase.java b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateBase.java
index 101aea4..1068767 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateBase.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateBase.java
@@ -245,10 +245,9 @@
}
@Override
- public void setTitle(CharSequence title) {
- ActionBar ab = getSupportActionBar();
- if (ab != null) {
- ab.setTitle(title);
+ public void onTitleChanged(CharSequence title) {
+ if (mActionBarView != null) {
+ mActionBarView.setWindowTitle(title);
}
}
diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateICS.java b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateICS.java
index b4fb03e..eda074f 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateICS.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateICS.java
@@ -160,7 +160,7 @@
}
@Override
- public void setTitle(CharSequence title) {
+ public void onTitleChanged(CharSequence title) {
// Handled by framework
}
