Backed out changeset a9f445169eca (bug 1030738)

This commit is contained in:
Ed Morley 2014-06-27 15:39:56 +01:00
parent f87f02576b
commit f649cbd3a0
2 changed files with 3 additions and 9 deletions

View File

@ -122,9 +122,7 @@ public class GeckoPreferenceFragment extends PreferenceFragment {
if (Build.VERSION.SDK_INT >= 14) {
final ActionBar actionBar = activity.getActionBar();
if (actionBar != null) {
actionBar.setTitle(newTitle);
}
actionBar.setTitle(newTitle);
}
}

View File

@ -140,9 +140,7 @@ OnSharedPreferenceChangeListener
Log.v(LOGTAG, "Setting action bar title to " + newTitle);
final ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setTitle(newTitle);
}
actionBar.setTitle(newTitle);
}
}
}
@ -362,9 +360,7 @@ OnSharedPreferenceChangeListener
if (Build.VERSION.SDK_INT >= 14) {
final ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setHomeButtonEnabled(true);
}
actionBar.setHomeButtonEnabled(true);
}
// N.B., if we ever need to redisplay the locale selection UI without