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

Commit 82d88d3f authored by Sebastián Franco's avatar Sebastián Franco Committed by Android (Google) Code Review
Browse files

Merge "Updating launcher settings so that they become split-screen" into main

parents e66ed039 9ae40329

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ android_library { 
        "androidx.preference_preference",

        "androidx.slice_slice-view",

        "androidx.cardview_cardview",

        "androidx.window_window",

        "com.google.android.material_material",

        "iconloader_base",

        "view_capture",

AndroidManifest-common.xml

+4 −0
Original line number Diff line number Diff line
@@ -184,5 +184,9 @@ 
            android:name="androidx.startup.InitializationProvider"

            android:authorities="${applicationId}.androidx-startup"

            tools:node="remove" />



        <property

            android:name="android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED"

            android:value="true" />

    </application>

</manifest>

aconfig/launcher.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -84,6 +84,13 @@ flag { 
    bug: "315055849"

}



flag {

    name: "enable_two_pane_launcher_settings"

    namespace: "launcher"

    description: "Enables two panel settings when on large enough displays"

    bug: "204463748"

}



flag {

    name: "enable_shortcut_dont_suggest_app"

    namespace: "launcher"

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -252,6 +252,9 @@ 
    <!--  Used for custom widgets  -->

    <array name="custom_widget_providers"/>



    <!-- Embed parameters -->

    <dimen name="activity_split_ratio"  format="float">0.5</dimen>

    <integer name="min_width_split">720</integer>



    <!-- Skip "Install to private" long-press shortcut packages name -->

    <string-array name="skip_private_profile_shortcut_packages" translatable="false">

res/xml/split_configuration.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources

    xmlns:window="http://schemas.android.com/apk/res-auto">

    <!-- Automatically split the following activity pairs. -->

    <SplitPairRule

        window:splitRatio="@dimen/activity_split_ratio"

        window:splitLayoutDirection="locale"

        window:splitMinWidthDp="@integer/min_width_split"

        window:splitMaxAspectRatioInPortrait="alwaysAllow"

        window:finishPrimaryWithSecondary="never"

        window:finishSecondaryWithPrimary="always"

        window:clearTop="false">

        <SplitPairFilter

            window:primaryActivityName="com.android.launcher3.settings.SettingsActivity"

            window:secondaryActivityName="com.android.launcher3.settings.SettingsActivity"/>



    </SplitPairRule>

</resources>
 
 No newline at end of file