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

Commit 4ce8e7bc authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Migrate off edge-to-edge opt out flag 

This reverts commit 9fd2770b.

Reason for revert: Next patch in the chain fixes the display.
Bug: 309578419
Test: Manual (open each of the screens and check layout hierarchy)
Flag: com.android.window.flags.disable_opt_out_edge_to_edge

Change-Id: Ia99a4a9a00d78525eab6b2d182032ececd4b91df
parent 9fd2770b

tests/graphics/SilkFX/AndroidManifest.xml

+2 −3
Original line number Diff line number Diff line
@@ -23,13 +23,12 @@ 
    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />



    <application android:label="SilkFX"

         android:theme="@style/Theme.UsefulDefault">

         android:theme="@android:style/Theme.Material">



        <activity android:name=".Main"

             android:label="SilkFX Demos"

             android:banner="@drawable/background1"

             android:exported="true"

             android:theme="@style/Theme.UsefulDefault">

             android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.DEFAULT"/>

tests/graphics/SilkFX/res/values/style.xml

+0 −5
Original line number Diff line number Diff line
@@ -23,14 +23,9 @@ 
        <item name="android:windowElevation">0dp</item>

        <item name="buttonStyle">@style/AppTheme.Button</item>

        <item name="colorAccent">#bbffffff</item>

        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>

    </style>

    <style name="AppTheme.Button" parent="Widget.AppCompat.Button">

        <item name="android:textColor">#ffffffff</item>

    </style>



    <style name="Theme.UsefulDefault" parent="android:Theme.Material">

        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>

    </style>



</resources>