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

Commit 510d653b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED... 

Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f00

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



Change-Id: I743f719b6d2561c2f1badd44b36ed623c0206a98
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0204d085 67b00f00

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -137,6 +137,10 @@ 


        <uses-library android:name="org.apache.http.legacy" />



        <property

            android:name="android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED"

            android:value="true" />



        <!-- Settings -->

        <activity android:name=".homepage.SettingsHomepageActivity"

                  android:label="@string/settings_label_launcher"