diff options
author | Chuck Liao <chuckliao@google.com> | 2021-05-21 12:17:49 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-21 12:17:49 +0000 |
commit | ace7a8238d156d55fddb0c2ce7043aa6e43e344f (patch) | |
tree | 2b203d9d8df500590d112604f9e5c16d30f78795 /src/com/android | |
parent | 284320e14ff30949901787527b393104695aad1e (diff) | |
parent | c080a0b71c0e04ed4588e148ef39a5ff226f4c42 (diff) | |
download | ThemePicker-ace7a8238d156d55fddb0c2ce7043aa6e43e344f.tar.gz |
Merge "Revert^2 "Return to Launcher Home after wallpaper/grid apply"" into sc-dev
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/customization/picker/grid/GridFragment.java | 4 | ||||
-rw-r--r-- | src/com/android/customization/util/LaunchUtils.java | 31 |
2 files changed, 35 insertions, 0 deletions
diff --git a/src/com/android/customization/picker/grid/GridFragment.java b/src/com/android/customization/picker/grid/GridFragment.java index ab381eec..b0802cf6 100644 --- a/src/com/android/customization/picker/grid/GridFragment.java +++ b/src/com/android/customization/picker/grid/GridFragment.java @@ -44,6 +44,7 @@ import com.android.customization.model.grid.GridOptionsManager; import com.android.customization.module.ThemesUserEventLogger; import com.android.customization.picker.ViewOnlyFullPreviewActivity; import com.android.customization.picker.WallpaperPreviewer; +import com.android.customization.util.LaunchUtils; import com.android.customization.widget.OptionSelectorController; import com.android.wallpaper.R; import com.android.wallpaper.model.WallpaperInfo; @@ -93,6 +94,9 @@ public class GridFragment extends AppbarFragment { Toast.makeText(getContext(), R.string.applied_grid_msg, Toast.LENGTH_SHORT).show(); getActivity().overridePendingTransition(R.anim.fade_in, R.anim.fade_out); getActivity().finish(); + + // Go back to launcher home + LaunchUtils.launchHome(getContext()); } @Override diff --git a/src/com/android/customization/util/LaunchUtils.java b/src/com/android/customization/util/LaunchUtils.java new file mode 100644 index 00000000..57791687 --- /dev/null +++ b/src/com/android/customization/util/LaunchUtils.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.customization.util; + +import android.content.Context; +import android.content.Intent; + +/** Util class for launching activity. */ +public class LaunchUtils { + + /** Goes to Launcher's Home. */ + public static void launchHome(Context context) { + Intent launcherIntent = new Intent(Intent.ACTION_MAIN); + launcherIntent.addCategory(Intent.CATEGORY_HOME); + launcherIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + context.startActivity(launcherIntent); + } +} |