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

Fix back stack didn't perserved when Files Activity launched by Setting storage then back case.

Browse Source 
Due to FilesActivity set "android:documentLaunchMode="intoExisting", it will create
new task when launched from Storage Setting page.

When select FilesActivity task from recents & press back key, it will not back
to settings page.

Using startActivityForResult to set task as source task can fix task separated case.

Change-Id: I26362928261a1a9c0e485a486be493423d1fcf61
Fixes: 33117269
Test: Manual
Test: atest StorageItemPreferenceControllerTest
This commit is contained in:
lumark
2018-06-11 15:20:39 +08:00
parent ddd9283ee0
commit 9e25726593
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -402,10 +402,14 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
try { try {
final int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, -1); final int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, -1);
// b/33117269: Note that launchIntent may launch activity in different task which set
// different launchMode (e.g. Files), using startActivityForesult to set task as
// source task, and set requestCode as 0 means don't care about returnCode currently.
if (userId == -1) { if (userId == -1) {
mFragment.startActivity(intent); mFragment.startActivityForResult(intent, 0 /* requestCode not used */);
} else { } else {
mFragment.getActivity().startActivityAsUser(intent, new UserHandle(userId)); mFragment.getActivity().startActivityForResultAsUser(intent,
0 /* requestCode not used */, new UserHandle(userId));
} }
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {
Log.w(TAG, "No activity found for " + intent); Log.w(TAG, "No activity found for " + intent);

28
tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
View File

@@ -19,6 +19,7 @@ import static com.android.settings.applications.manageapplications.ManageApplica
import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ONLY; import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ONLY;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -123,7 +124,8 @@ public class StorageItemPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference); mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class); final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
verify(mActivity).startActivityAsUser(argumentCaptor.capture(), nullable(UserHandle.class)); verify(mActivity).startActivityForResultAsUser(argumentCaptor.capture(), anyInt(),
nullable(UserHandle.class));
final Intent intent = argumentCaptor.getValue(); final Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN); assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -140,8 +142,8 @@ public class StorageItemPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference); mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class); final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
verify(mFragment.getActivity()) verify(mFragment.getActivity()).startActivityForResultAsUser(argumentCaptor.capture(),
.startActivityAsUser(argumentCaptor.capture(), nullable(UserHandle.class)); anyInt(), nullable(UserHandle.class));
final Intent intent = argumentCaptor.getValue(); final Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN); assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -167,8 +169,8 @@ public class StorageItemPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference); mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class); final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(), verify(mFragment.getActivity()).startActivityForResultAsUser(argumentCaptor.capture(),
nullable(UserHandle.class)); anyInt(), nullable(UserHandle.class));
final Intent intent = argumentCaptor.getValue(); final Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN); assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -186,8 +188,8 @@ public class StorageItemPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference); mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class); final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
verify(mFragment.getActivity()) verify(mFragment.getActivity()).startActivityForResultAsUser(argumentCaptor.capture(),
.startActivityAsUser(argumentCaptor.capture(), nullable(UserHandle.class)); anyInt(), nullable(UserHandle.class));
Intent intent = argumentCaptor.getValue(); Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN); assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -223,8 +225,8 @@ public class StorageItemPreferenceControllerTest {
.isTrue(); .isTrue();
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class); final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(), verify(mFragment.getActivity()).startActivityForResultAsUser(argumentCaptor.capture(),
nullable(UserHandle.class)); anyInt(), nullable(UserHandle.class));
Intent intent = argumentCaptor.getValue(); Intent intent = argumentCaptor.getValue();
Intent browseIntent = mVolume.buildBrowseIntent(); Intent browseIntent = mVolume.buildBrowseIntent();
@@ -240,8 +242,8 @@ public class StorageItemPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference); mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class); final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(), verify(mFragment.getActivity()).startActivityForResultAsUser(argumentCaptor.capture(),
nullable(UserHandle.class)); anyInt(), nullable(UserHandle.class));
Intent intent = argumentCaptor.getValue(); Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN); assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -258,8 +260,8 @@ public class StorageItemPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference); mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class); final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(), verify(mFragment.getActivity()).startActivityForResultAsUser(argumentCaptor.capture(),
nullable(UserHandle.class)); anyInt(), nullable(UserHandle.class));
Intent intent = argumentCaptor.getValue(); Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN); assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);