PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arc Wang
2021-11-10 08:52:07 +00:00
committed by Android (Google) Code Review
parent 084cfd4142 0f5e75e098
commit 7c86d3d7a7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SettingsActivity.java
View File

@@ -370,8 +370,9 @@ public class SettingsActivity extends SettingsBaseActivity
final SplitStateObserver splitStateObserver = new SplitStateObserver(this /* activity*/, final SplitStateObserver splitStateObserver = new SplitStateObserver(this /* activity*/,
true /* listenOnce */, true /* listenOnce */,
splitInfos -> { splitInfos -> {
if (!splitInfos.isEmpty()) { if (!splitInfos.isEmpty() || !SettingsActivity.this.isTaskRoot()) {
// It's already in 2-pane and no need to go 2-pane deep link flow. // It's already in 2-pane or in a non-empty task, there is no need to go
// 2-pane deep link flow.
return; return;
} }