commit | 781f3e70d55b9c080dc56b07a4ebb69ef922d83f | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 26 21:39:09 2021 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 26 21:39:09 2021 +0000 |
tree | fc49e7260949e839b8cf24fa8e2ae06ee4434516 | |
parent | 96bbfcd386ea1e9af785303b41b24c442ea0158e [diff] | |
parent | d0c5979f4f7946673e2e1c40c11638cf9fcbb97e [diff] |
Merge "Update layout for grid options" into sc-dev
diff --git a/src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java b/src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java index f1f1e72..e352879 100644 --- a/src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java +++ b/src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java
@@ -516,7 +516,7 @@ return; } - if (!ActivityUtils.isLaunchedFromSettings(getIntent())) { + if (!ActivityUtils.isLaunchedFromSettingsRelated(getIntent())) { Intent intent = new Intent(Settings.ACTION_SETTINGS); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); startActivity(intent);