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

Commit 8434377c authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Clean up predictive_back_default_enable_sdk_36 flag" into main

parents e6c935b6 d502cf04

core/java/android/window/flags/windowing_frontend.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -301,14 +301,6 @@ flag { 
    }

}



flag {

    name: "predictive_back_default_enable_sdk_36"

    namespace: "systemui"

    description: "Enable Predictive Back by default with targetSdk>=36"

    is_fixed_read_only: true

    bug: "376407910"

}



flag {

  name: "relative_insets"

  namespace: "windowing_frontend"

core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java

+1 −2
Original line number Diff line number Diff line
@@ -2504,8 +2504,7 @@ public class ParsingPackageUtils { 
                // accessing Build.VERSION_CODES directly and suppressing

                // AndroidFrameworkCompatChange warning

                .setOnBackInvokedCallbackEnabled(bool(

                        com.android.window.flags.Flags.predictiveBackDefaultEnableSdk36()

                            && targetSdk > Build.VERSION_CODES.VANILLA_ICE_CREAM,

                        targetSdk > Build.VERSION_CODES.VANILLA_ICE_CREAM,

                        R.styleable.AndroidManifestApplication_enableOnBackInvokedCallback, sa))

                // Ints Default 0

                .setUiOptions(anInt(R.styleable.AndroidManifestApplication_uiOptions, sa))