PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update back FooterButton visibility for navigation instead of back button" into tm-qpr-dev am: af11c676a9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19682757

Change-Id: Iae792a3cb815612047ffb2c14fee3c40a19653d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sayak Dutta
2022-08-23 20:22:51 +00:00
committed by Automerger Merge Worker
parent c29ab9bf8b af11c676a9
commit 3985485b3a
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/deviceinfo/StorageWizardInit.java
View File

@@ -76,36 +76,28 @@ public class StorageWizardInit extends StorageWizardBase {
} }
} }
@Override
public void onBackPressed() {
if (mPortable) {
super.onBackPressed();
} else {
mFlipper.showPrevious();
setBackButtonText(R.string.wizard_back_adoptable);
setHeaderText(R.string.storage_wizard_init_v2_external_title,
getDiskShortDescription());
setNextButtonText(R.string.storage_wizard_init_v2_external_action);
mPortable = true;
}
}
@Override @Override
public void onNavigateBack(View v) { public void onNavigateBack(View v) {
if (mPortable == false) {
return;
}
if (!mIsPermittedToAdopt) { if (!mIsPermittedToAdopt) {
// TODO: Show a message about why this is disabled for guest and // TODO: Show a message about why this is disabled for guest and
// that only an admin user can adopt an sd card. // that only an admin user can adopt an sd card.
v.setEnabled(false); v.setEnabled(false);
} else if (mPortable == false) {
mFlipper.showNext();
setHeaderText(R.string.storage_wizard_init_v2_external_title,
getDiskShortDescription());
setNextButtonText(R.string.storage_wizard_init_v2_external_action);
setBackButtonText(R.string.wizard_back_adoptable);
setBackButtonVisibility(View.VISIBLE);
mPortable = true;
} else { } else {
mFlipper.showNext(); mFlipper.showNext();
setHeaderText(R.string.storage_wizard_init_v2_internal_title, setHeaderText(R.string.storage_wizard_init_v2_internal_title,
getDiskShortDescription()); getDiskShortDescription());
setNextButtonText(R.string.storage_wizard_init_v2_internal_action); setNextButtonText(R.string.storage_wizard_init_v2_internal_action);
setBackButtonVisibility(View.INVISIBLE); setBackButtonText(R.string.wizard_back_adoptable);
setBackButtonVisibility(View.VISIBLE);
mPortable = false; mPortable = false;
} }
} }
@@ -162,4 +154,4 @@ public class StorageWizardInit extends StorageWizardBase {
} }
return s; return s;
} }
} }