am b126a4ea: am 084dd048: am fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev

* commit 'b126a4ea4abffecd9580b1c56cde22f58e7f742d':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.
This commit is contained in:
Jeff Sharkey
2015-07-07 00:31:43 +00:00
committed by Android Git Automerger
10 changed files with 102 additions and 53 deletions

View File

@@ -150,7 +150,9 @@ public abstract class StorageWizardBase extends Activity {
}
protected void setHeaderText(int resId, String... args) {
getSetupWizardLayout().setHeaderText(TextUtils.expandTemplate(getText(resId), args));
final CharSequence headerText = TextUtils.expandTemplate(getText(resId), args);
getSetupWizardLayout().setHeaderText(headerText);
setTitle(headerText);
}
protected void setBodyText(int resId, String... args) {