Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78672f8e authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Custom theme should not be selected if not defined 

Make sure we keep the previously selected theme when
the user canceled the new custom theme creation

Bug: 129157694
Change-Id: I3948fc0dd9af44351660fe9b2a85364acacadf8e
parent 72516156

src/com/android/customization/picker/theme/ThemeFragment.java

+7 −2
Original line number Diff line number Diff line
@@ -161,9 +161,14 @@ public class ThemeFragment extends ToolbarFragment { 
            if (resultCode == CustomThemeActivity.RESULT_THEME_DELETED) {

                mSelectedTheme = null;

                reloadOptions();

            }

            if (resultCode == CustomThemeActivity.RESULT_THEME_APPLIED) {

            } else if (resultCode == CustomThemeActivity.RESULT_THEME_APPLIED) {

                getActivity().finish();

            } else {

                if (mSelectedTheme != null) {

                    mOptionsController.setSelectedOption(mSelectedTheme);

                } else {

                    reloadOptions();

                }

            }

        }

        super.onActivityResult(requestCode, resultCode, data);