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

Commit 4bdd4359 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am:... 

Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3 am: a0ebaf2b am: 9d882fbb

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



Change-Id: I0ac35362b2d5619ade43a004e948da8b84a0a957
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb368c1a 9d882fbb

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ 
                  android:taskAffinity="com.android.settings.root"

                  android:launchMode="singleTask"

                  android:exported="true"

                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout">

                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize">

            <intent-filter android:priority="1">

                <action android:name="android.settings.SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -158,7 +158,7 @@ 
                  android:launchMode="singleTask"

                  android:exported="true"

                  android:enabled="false"

                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout"

                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"

                  android:permission="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK">

            <intent-filter>

                <action android:name="android.settings.SETTINGS_EMBED_DEEP_LINK_ACTIVITY" />
@@ -175,7 +175,7 @@ 
                  android:launchMode="singleTask"

                  android:exported="false"

                  android:excludeFromRecents="true"

                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout">

                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize">

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>