TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lint issues

Browse Source
This commit is contained in:
serso
2015-02-09 16:11:26 +01:00
parent bc0e6d2344
commit 32e755d2fc
156 changed files with 1757 additions and 2168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteFragment.java
View File

@@ -13,6 +13,6 @@ public class ChooseThemeReleaseNoteFragment extends ChooseThemeWizardStep {
super.onViewCreated(root, savedInstanceState);
final TextView title = (TextView) root.findViewById(R.id.wizard_theme_title);
title.setText(R.string.release_notes_choose_theme);
title.setText(R.string.cpp_release_notes_choose_theme);
}
}

2
android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
View File

@@ -120,7 +120,7 @@ public class WizardActivity extends BaseActivity implements WizardsAware, Shared
}
final AlertDialog.Builder b = new AlertDialog.Builder(this);
b.setTitle(getString(R.string.wizard_finish_confirmation_title)).
b.setTitle(getString(R.string.cpp_wizard_finish_confirmation_title)).
setMessage(R.string.cpp_wizard_finish_confirmation).
setNegativeButton(R.string.c_no, dialogListener).
setPositiveButton(R.string.c_yes, dialogListener).

10
android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardFragment.java
View File

@@ -79,19 +79,19 @@ public abstract class WizardFragment extends Fragment implements View.OnClickLis
final boolean firstTimeWizard = TextUtils.equals(wizard.getName(), CalculatorWizards.FIRST_TIME_WIZARD);
if (canGoNext) {
if (canGoPrev || !firstTimeWizard) {
setupNextButton(R.string.acl_wizard_next);
setupNextButton(R.string.cpp_wizard_next);
} else {
setupNextButton(R.string.acl_wizard_start);
setupNextButton(R.string.cpp_wizard_start);
}
} else {
setupNextButton(R.string.acl_wizard_finish);
setupNextButton(R.string.cpp_wizard_finish);
}
if (canGoPrev) {
setupPrevButton(R.string.acl_wizard_back);
setupPrevButton(R.string.cpp_wizard_back);
} else {
if (firstTimeWizard) {
setupPrevButton(R.string.wizard_skip);
setupPrevButton(R.string.cpp_wizard_skip);
}
}