зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset a9f445169eca (bug 1030738)
This commit is contained in:
Родитель
9e45624647
Коммит
4ffdb7481a
|
@ -122,11 +122,9 @@ public class GeckoPreferenceFragment extends PreferenceFragment {
|
|||
|
||||
if (Build.VERSION.SDK_INT >= 14) {
|
||||
final ActionBar actionBar = activity.getActionBar();
|
||||
if (actionBar != null) {
|
||||
actionBar.setTitle(newTitle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
|
|
|
@ -140,12 +140,10 @@ OnSharedPreferenceChangeListener
|
|||
Log.v(LOGTAG, "Setting action bar title to " + newTitle);
|
||||
|
||||
final ActionBar actionBar = getActionBar();
|
||||
if (actionBar != null) {
|
||||
actionBar.setTitle(newTitle);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void updateTitle(String newTitle) {
|
||||
if (newTitle != null) {
|
||||
|
@ -362,10 +360,8 @@ OnSharedPreferenceChangeListener
|
|||
|
||||
if (Build.VERSION.SDK_INT >= 14) {
|
||||
final ActionBar actionBar = getActionBar();
|
||||
if (actionBar != null) {
|
||||
actionBar.setHomeButtonEnabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
// N.B., if we ever need to redisplay the locale selection UI without
|
||||
// just finishing and recreating the activity, right here we'll need to
|
||||
|
|
Загрузка…
Ссылка в новой задаче