Add android:configChanges for SettingsHomepageActivity am: fdfac783ab

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

Change-Id: I209e5a92a20770bc7ecba9ecfc65385c0d8e7b4e
This commit is contained in:
Arc Wang
2021-09-15 10:39:30 +00:00
committed by Automerger Merge Worker
2 changed files with 4 additions and 1 deletions

View File

@@ -136,7 +136,7 @@
android:taskAffinity="com.android.settings.root" android:taskAffinity="com.android.settings.root"
android:launchMode="singleTask" android:launchMode="singleTask"
android:exported="true" android:exported="true"
android:configChanges="keyboard|keyboardHidden"> android:configChanges="keyboard|keyboardHidden|screenSize|screenLayout">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.SETTINGS" /> <action android:name="android.settings.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

View File

@@ -208,6 +208,9 @@ public class SettingsHomepageActivity extends FragmentActivity implements
return; return;
} }
// To prevent launchDeepLinkIntentToRight again for configuration change.
intent.setAction(null);
targetIntent.setFlags(targetIntent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK); targetIntent.setFlags(targetIntent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK);
targetIntent.putExtra(EXTRA_IS_FROM_SETTINGS_HOMEPAGE, true); targetIntent.putExtra(EXTRA_IS_FROM_SETTINGS_HOMEPAGE, true);