Exit app after a theme/gird is applied
Test: Manually
Bug: 157951178
Change-Id: I2bf1e579ad195dba31fe26170fbc19a2af4218f0
diff --git a/src/com/android/customization/picker/grid/GridFragment.java b/src/com/android/customization/picker/grid/GridFragment.java
index b861e6a..05f535c 100644
--- a/src/com/android/customization/picker/grid/GridFragment.java
+++ b/src/com/android/customization/picker/grid/GridFragment.java
@@ -101,34 +101,16 @@
private final Callback mApplyGridCallback = new Callback() {
@Override
public void onSuccess() {
- mGridManager.fetchOptions(new OptionsFetchedListener<GridOption>() {
- @Override
- public void onOptionsLoaded(List<GridOption> options) {
- mOptionsController.resetOptions(options);
- mSelectedOption = getActiveOption(options);
- mOptionsController.setAppliedOption(mSelectedOption);
- mReloadOptionsAfterApplying = true;
- // It will trigger OptionSelectedListener#onOptionSelected.
- mOptionsController.setSelectedOption(mSelectedOption);
- Toast.makeText(getContext(), R.string.applied_grid_msg, Toast.LENGTH_SHORT)
- .show();
- // Since we disabled it when clicked apply button.
- mBottomActionBar.enableActions();
- mBottomActionBar.hide();
- }
-
- @Override
- public void onError(@Nullable Throwable throwable) {
- if (throwable != null) {
- Log.e(TAG, "Error loading grid options", throwable);
- }
- showError();
- }
- }, true);
+ Toast.makeText(getContext(), R.string.applied_grid_msg, Toast.LENGTH_SHORT).show();
+ getActivity().overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+ getActivity().finish();
}
@Override
public void onError(@Nullable Throwable throwable) {
+ // Since we disabled it when clicked apply button.
+ mBottomActionBar.enableActions();
+ mBottomActionBar.hide();
//TODO(chihhangchuang): handle
}
};
diff --git a/src/com/android/customization/picker/theme/ThemeFragment.java b/src/com/android/customization/picker/theme/ThemeFragment.java
index 64147b2..5c5dcdd 100644
--- a/src/com/android/customization/picker/theme/ThemeFragment.java
+++ b/src/com/android/customization/picker/theme/ThemeFragment.java
@@ -197,11 +197,9 @@
mThemeManager.apply(mSelectedTheme, new Callback() {
@Override
public void onSuccess() {
- // Since we disabled it when clicked apply button.
- mBottomActionBar.enableActions();
- mBottomActionBar.hide();
- Toast.makeText(getContext(), R.string.applied_theme_msg,
- Toast.LENGTH_LONG).show();
+ Toast.makeText(getContext(), R.string.applied_theme_msg, Toast.LENGTH_LONG).show();
+ getActivity().overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+ getActivity().finish();
}
@Override
@@ -235,7 +233,8 @@
mSelectedTheme = null;
reloadOptions();
} else if (resultCode == CustomThemeActivity.RESULT_THEME_APPLIED) {
- reloadOptions();
+ getActivity().overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+ getActivity().finish();
} else {
if (mSelectedTheme != null) {
mOptionsController.setSelectedOption(mSelectedTheme);