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

Merge "Disable animations of deep link homepages to reduce the shortcut flicker" into sc-v2-dev am: 50bfe197b7 am: e17163adf5

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

Change-Id: Ieda1cc4cb20500d32c9f4c8a43d603d1e40992f3
This commit is contained in:
Jason Chiu
2021-12-03 09:46:17 +00:00
committed by Automerger Merge Worker
parent fd9287b7da e17163adf5
commit e574b6e11b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -146,7 +146,7 @@
<!-- Activity for launching deep link page in 2-pane. --> <!-- Activity for launching deep link page in 2-pane. -->
<activity android:name=".homepage.DeepLinkHomepageActivity" <activity android:name=".homepage.DeepLinkHomepageActivity"
android:label="@string/settings_label_launcher" android:label="@string/settings_label_launcher"
android:theme="@style/Theme.Settings.Home" android:theme="@style/Theme.Settings.Home.DeepLink"
android:taskAffinity="" android:taskAffinity=""
android:launchMode="singleTask" android:launchMode="singleTask"
android:exported="true" android:exported="true"
@@ -162,7 +162,7 @@
<activity android:name=".homepage.SliceDeepLinkHomepageActivity" <activity android:name=".homepage.SliceDeepLinkHomepageActivity"
android:label="@string/settings_label_launcher" android:label="@string/settings_label_launcher"
android:theme="@style/Theme.Settings.Home" android:theme="@style/Theme.Settings.Home.DeepLink"
android:taskAffinity="" android:taskAffinity=""
android:launchMode="singleTask" android:launchMode="singleTask"
android:exported="false" android:exported="false"

4
res/values/themes.xml
View File

@@ -220,6 +220,10 @@
<item name="android:statusBarColor">?attr/colorPrimaryDark</item> <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
</style> </style>
<style name="Theme.Settings.Home.DeepLink">
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="Theme.Settings.ContextualCard" parent="Theme.Settings.Home"> <style name="Theme.Settings.ContextualCard" parent="Theme.Settings.Home">
<item name="android:textAppearanceListItem">@style/TextAppearance.HomepageCardTitle</item> <item name="android:textAppearanceListItem">@style/TextAppearance.HomepageCardTitle</item>
</style> </style>