[Large screen] SplitListener may not provide correct information
SettingsActivity may send Settings 2-pane deep link Intent to SettingsHomepageActivity if split callback tells that there is no SplitInfo. Wallpaper app sends deep link Intent to SettingsHomepageActivity, and then SettingsHomepageActivity starts Wallpaper app page. The flow should be 2-pane organized but the split callback tells that splitInfos is empty. This change checks if the Intent is from SettingsHomepageActivity to prevent the Intent loop by the bug. Bug: 205206004 Test: manual Long click Launcher -> Wallpaper & style Change-Id: I6b9d76c136238e556384e891ae1700ae7c1bb41f
This commit is contained in:
@@ -451,6 +451,11 @@ public class SettingsActivity extends SettingsBaseActivity
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (intent.getBooleanExtra(SettingsHomepageActivity.EXTRA_IS_FROM_SETTINGS_HOMEPAGE,
|
||||||
|
/* defaultValue */ false)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (TextUtils.equals(intent.getAction(), Intent.ACTION_CREATE_SHORTCUT)) {
|
if (TextUtils.equals(intent.getAction(), Intent.ACTION_CREATE_SHORTCUT)) {
|
||||||
// Returns false to show full screen for Intent.ACTION_CREATE_SHORTCUT because
|
// Returns false to show full screen for Intent.ACTION_CREATE_SHORTCUT because
|
||||||
// - Launcher startActivityForResult for Intent.ACTION_CREATE_SHORTCUT and activity
|
// - Launcher startActivityForResult for Intent.ACTION_CREATE_SHORTCUT and activity
|
||||||
|
@@ -63,6 +63,10 @@ public class SettingsHomepageActivity extends FragmentActivity implements
|
|||||||
|
|
||||||
private static final String TAG = "SettingsHomepageActivity";
|
private static final String TAG = "SettingsHomepageActivity";
|
||||||
|
|
||||||
|
// Additional extra of Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
|
||||||
|
// Put true value to the intent when startActivity for a deep link intent from this Activity.
|
||||||
|
public static final String EXTRA_IS_FROM_SETTINGS_HOMEPAGE = "is_from_settings_homepage";
|
||||||
|
|
||||||
// Additional extra of Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
|
// Additional extra of Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
|
||||||
// Set & get Uri of the Intent separately to prevent failure of Intent#ParseUri.
|
// Set & get Uri of the Intent separately to prevent failure of Intent#ParseUri.
|
||||||
public static final String EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA =
|
public static final String EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA =
|
||||||
@@ -264,6 +268,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
|
|||||||
// Sender of intent may want to send intent extra data to the destination of targetIntent.
|
// Sender of intent may want to send intent extra data to the destination of targetIntent.
|
||||||
targetIntent.replaceExtras(intent);
|
targetIntent.replaceExtras(intent);
|
||||||
|
|
||||||
|
targetIntent.putExtra(EXTRA_IS_FROM_SETTINGS_HOMEPAGE, true);
|
||||||
targetIntent.putExtra(SettingsActivity.EXTRA_IS_FROM_SLICE, false);
|
targetIntent.putExtra(SettingsActivity.EXTRA_IS_FROM_SLICE, false);
|
||||||
|
|
||||||
targetIntent.setData(intent.getParcelableExtra(
|
targetIntent.setData(intent.getParcelableExtra(
|
||||||
|
Reference in New Issue
Block a user