Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e574b6e1 authored by Jason Chiu's avatar Jason Chiu Committed by Automerger Merge Worker
Browse files

Merge "Disable animations of deep link homepages to reduce the shortcut... 

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

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

Change-Id: Ieda1cc4cb20500d32c9f4c8a43d603d1e40992f3
parents fd9287b7 e17163ad

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,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"
@@ -162,7 +162,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"

res/values/themes.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>