Merge "Disable animations of deep link homepages to reduce the shortcut flicker" into sc-v2-dev am: 50bfe197b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16297689
Change-Id: I05f4f60f96dcc0b83cb7af76943a56a59d0fb0af
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b0b70a3..88b7294 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -147,7 +147,7 @@
<!-- Activity for launching deep link page in 2-pane. -->
<activity android:name=".homepage.DeepLinkHomepageActivity"
android:label="@string/settings_label_launcher"
- android:theme="@style/Theme.Settings.Home"
+ android:theme="@style/Theme.Settings.Home.DeepLink"
android:taskAffinity=""
android:launchMode="singleTask"
android:exported="true"
@@ -163,7 +163,7 @@
<activity android:name=".homepage.SliceDeepLinkHomepageActivity"
android:label="@string/settings_label_launcher"
- android:theme="@style/Theme.Settings.Home"
+ android:theme="@style/Theme.Settings.Home.DeepLink"
android:taskAffinity=""
android:launchMode="singleTask"
android:exported="false"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 7c5c111..d65c1b3 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -220,6 +220,10 @@
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
</style>
+ <style name="Theme.Settings.Home.DeepLink">
+ <item name="android:windowAnimationStyle">@null</item>
+ </style>
+
<style name="Theme.Settings.ContextualCard" parent="Theme.Settings.Home">
<item name="android:textAppearanceListItem">@style/TextAppearance.HomepageCardTitle</item>
</style>