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

Commit a75bd55a authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Allow WindowManager.TYPE_SCREENSHOT to be focusable" into rvc-dev am: d8aa60aa 

Change-Id: I94422d0305adf683f615a8ba0da09f1223ebdea5
parents e5406ac7 d8aa60aa

core/java/android/view/WindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ public interface WindowManager extends ViewManager { 


        /**

         * Window type: shows directly above the keyguard. The layer is

         * reserved for screenshot region selection. These windows must not take input focus.

         * reserved for screenshot animation, region selection and UI.

         * In multiuser systems shows only on the owning user's window.

         * @hide

         */

services/core/java/com/android/server/wm/DisplayPolicy.java

+0 −4
Original line number Diff line number Diff line
@@ -874,10 +874,6 @@ public class DisplayPolicy { 
                }

                break;



            case TYPE_SCREENSHOT:

                attrs.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

                break;



            case TYPE_TOAST:

                // While apps should use the dedicated toast APIs to add such windows

                // it possible legacy apps to add the window directly. Therefore, we