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

Commit f7f16510 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "swipe-dismiss: use original context for theme check" into main

parents f25c6a55 996ff0ce

core/java/android/window/WindowOnBackInvokedDispatcher.java

+4 −1
Original line number Diff line number Diff line
@@ -467,6 +467,7 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
            boolean requestsPredictiveBack = false;



            // Check if the context is from an activity.

            Context originalContext = context;

            while ((context instanceof ContextWrapper) && !(context instanceof Activity)) {

                context = ((ContextWrapper) context).getBaseContext();

            }
@@ -515,8 +516,10 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
                    // 3. windowSwipeToDismiss=false should be respected for apps not opted in,

                    //    which disables PB & onBackPressed caused by BackAnimController's

                    //    setTrigger(true)

                    // Use the original context to resolve the styled attribute so that they stay

                    // true to the window.

                    TypedArray windowAttr =

                            context.obtainStyledAttributes(

                            originalContext.obtainStyledAttributes(

                                    new int[] {android.R.attr.windowSwipeToDismiss});

                    boolean windowSwipeToDismiss = true;

                    if (windowAttr.getIndexCount() > 0) {