Merge "[Large screen] Fix searched Subsettings back navigation bug" into sc-v2-dev am: c1b5f7883c am: 31ec8a9128

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145690 Change-Id: I53557ce86744f44a2e43af451c286c054bb1646d
2021-11-01 01:57:31 +00:00
parent c8c3f5c9b4 31ec8a9128
commit d9d4866004
5 changed files with 44 additions and 13 deletions
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -180,7 +180,10 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
                                        com.android.settings.Settings.class.getName()),
                                new ComponentName(tile.getPackageName(),
                                        tile.getComponentName()),
-                                null, true, true);
+                                null /* secondaryIntentAction */,
+                                true /* finishPrimaryWithSecondary */,
+                                true /* finishSecondaryWithPrimary */,
+                                true /* clearTop */);

                        // Highlight preference ui.
                        final TopLevelSettings topLevelSettings = (TopLevelSettings) fragment;