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

Commit 51a7c73a authored by Arc Wang's avatar Arc Wang Committed by Automerger Merge Worker
Browse files

Merge "[Large sceen] Don't go Settings 2-pane deep link flow if not task root"... 

Merge "[Large sceen] Don't go Settings 2-pane deep link flow if not task root" into sc-v2-dev am: 7c86d3d7

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

Change-Id: I75147641e475df2c98135c956a4bb6ef3ee12d69
parents 8458e956 7c86d3d7

src/com/android/settings/SettingsActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -370,8 +370,9 @@ public class SettingsActivity extends SettingsBaseActivity 
        final SplitStateObserver splitStateObserver = new SplitStateObserver(this /* activity*/,

                true /* listenOnce */,

                splitInfos -> {

                    if (!splitInfos.isEmpty()) {

                        // It's already in 2-pane and no need to go 2-pane deep link flow.

                    if (!splitInfos.isEmpty() || !SettingsActivity.this.isTaskRoot()) {

                        // It's already in 2-pane or in a non-empty task, there is no need to go

                        // 2-pane deep link flow.

                        return;

                    }