Merge "Change Action Bar title in a11y SUW to match setting name. Bug: 27326637" into nyc-dev

am: 445bd53e51

* commit '445bd53e5176f6140779284b6cc3110b06722ca5':
  Change Action Bar title in a11y SUW to match setting name. Bug: 27326637
This commit is contained in:
Anna Galusza
2016-02-29 19:51:18 +00:00
committed by android-build-merger

View File

@@ -19,6 +19,7 @@ package com.android.settings.accessibility;
import android.app.Fragment; import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
import android.text.TextUtils;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@@ -52,6 +53,12 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
@Override @Override
public void startPreferencePanel(String fragmentClass, Bundle args, int titleRes, public void startPreferencePanel(String fragmentClass, Bundle args, int titleRes,
CharSequence titleText, Fragment resultTo, int resultRequestCode) { CharSequence titleText, Fragment resultTo, int resultRequestCode) {
if (!TextUtils.isEmpty(titleText)) {
setTitle(titleText);
} else if (titleRes > 0) {
setTitle(getString(titleRes));
}
args.putInt(SettingsPreferenceFragment.HELP_URI_RESOURCE_KEY, 0); args.putInt(SettingsPreferenceFragment.HELP_URI_RESOURCE_KEY, 0);
startPreferenceFragment(Fragment.instantiate(this, fragmentClass, args), true); startPreferenceFragment(Fragment.instantiate(this, fragmentClass, args), true);
} }