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

Commit c49cf542 authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Automerger Merge Worker
Browse files

Merge "Open IM.getMaximumObscuringOpacityForTouch() and update docs." into sc-dev am: bf1903d2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13428006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95e54ee88c37582141a8c08bd48db00a3133d9d0
parents 81fec881 bf1903d2

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -18500,6 +18500,7 @@ package android.hardware.input { 
  public final class InputManager {

    method public android.view.InputDevice getInputDevice(int);

    method public int[] getInputDeviceIds();

    method public float getMaximumObscuringOpacityForTouch();

    method public void registerInputDeviceListener(android.hardware.input.InputManager.InputDeviceListener, android.os.Handler);

    method public void unregisterInputDeviceListener(android.hardware.input.InputManager.InputDeviceListener);

    method @Nullable public android.view.VerifiedInputEvent verifyInputEvent(@NonNull android.view.InputEvent);

core/api/test-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -944,9 +944,8 @@ package android.hardware.input { 


  public final class InputManager {

    method public int getBlockUntrustedTouchesMode(@NonNull android.content.Context);

    method public float getMaximumObscuringOpacityForTouch(@NonNull android.content.Context);

    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setBlockUntrustedTouchesMode(@NonNull android.content.Context, int);

    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setMaximumObscuringOpacityForTouch(@NonNull android.content.Context, float);

    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setMaximumObscuringOpacityForTouch(float);

    field public static final long BLOCK_UNTRUSTED_TOUCHES = 158002302L; // 0x96aec7eL

  }

core/java/android/hardware/input/InputManager.java

+12 −11
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.SdkConstant; 
import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.app.ActivityThread;

import android.compat.annotation.ChangeId;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;
@@ -909,18 +910,17 @@ public final class InputManager { 
    }



    /**

     * Returns the maximum allowed obscuring opacity by UID to propagate touches.

     * Returns the maximum allowed obscuring opacity per UID to propagate touches.

     *

     * For certain window types (eg. SAWs), the decision of honoring {@link LayoutParams

     * #FLAG_NOT_TOUCHABLE} or not depends on the combined obscuring opacity of the windows

     * above the touch-consuming window.

     * <p>For certain window types (eg. {@link LayoutParams#TYPE_APPLICATION_OVERLAY}), the decision

     * of honoring {@link LayoutParams#FLAG_NOT_TOUCHABLE} or not depends on the combined obscuring

     * opacity of the windows above the touch-consuming window, per UID. Check documentation of

     * {@link LayoutParams#FLAG_NOT_TOUCHABLE} for more details.

     *

     * @see #setMaximumObscuringOpacityForTouch(Context, float)

     *

     * @hide

     * @see LayoutParams#FLAG_NOT_TOUCHABLE

     */

    @TestApi

    public float getMaximumObscuringOpacityForTouch(@NonNull Context context) {

    public float getMaximumObscuringOpacityForTouch() {

        Context context = ActivityThread.currentApplication();

        return Settings.Global.getFloat(context.getContentResolver(),

                Settings.Global.MAXIMUM_OBSCURING_OPACITY_FOR_TOUCH,

                DEFAULT_MAXIMUM_OBSCURING_OPACITY_FOR_TOUCH);
@@ -946,17 +946,18 @@ public final class InputManager { 
     *

     * This value should be between 0 (inclusive) and 1 (inclusive).

     *

     * @see #getMaximumObscuringOpacityForTouch(Context)

     * @see #getMaximumObscuringOpacityForTouch()

     *

     * @hide

     */

    @TestApi

    @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)

    public void setMaximumObscuringOpacityForTouch(@NonNull Context context, float opacity) {

    public void setMaximumObscuringOpacityForTouch(float opacity) {

        if (opacity < 0 || opacity > 1) {

            throw new IllegalArgumentException(

                    "Maximum obscuring opacity for touch should be >= 0 and <= 1");

        }

        Context context = ActivityThread.currentApplication();

        Settings.Global.putFloat(context.getContentResolver(),

                Settings.Global.MAXIMUM_OBSCURING_OPACITY_FOR_TOUCH, opacity);

    }

core/java/android/provider/Settings.java

+2 −3
Original line number Diff line number Diff line
@@ -14721,9 +14721,8 @@ public final class Settings { 
         *     touch, allow the UID to propagate the touch.

         * </ul>

         *

         * @see android.hardware.input.InputManager#getMaximumObscuringOpacityForTouch(Context)

         * @see android.hardware.input.InputManager#setMaximumObscuringOpacityForTouch(Context,

         * float)

         * @see android.hardware.input.InputManager#getMaximumObscuringOpacityForTouch()

         * @see android.hardware.input.InputManager#setMaximumObscuringOpacityForTouch(float)

         *

         * @hide

         */

core/java/android/view/WindowManager.java

+13 −4
Original line number Diff line number Diff line
@@ -1555,17 +1555,26 @@ public interface WindowManager extends ViewManager { 
         *   <li><b>Fully transparent windows</b>: This window has {@link LayoutParams#alpha} equal

         *   to 0.

         *   <li><b>One SAW window with enough transparency</b>: This window is of type {@link

         *   #TYPE_APPLICATION_OVERLAY}, has {@link LayoutParams#alpha} below or equal to <b>0.8</b>

         *   and it's the <b>only</b> window of type {@link #TYPE_APPLICATION_OVERLAY} from this UID

         *   in the touch path.

         *   #TYPE_APPLICATION_OVERLAY}, has {@link LayoutParams#alpha} below or equal to the

         *   <a href="#MaximumOpacity">maximum obscuring opacity</a> (see below) and it's the

         *   <b>only</b> window of type {@link #TYPE_APPLICATION_OVERLAY} from this UID in the touch

         *   path.

         *   <li><b>Multiple SAW windows with enough transparency</b>: The multiple overlapping

         *   {@link #TYPE_APPLICATION_OVERLAY} windows in the

         *   touch path from this UID have a <b>combined obscuring opacity</b> below or equal to

         *   <b>0.8</b>. See section below on how to compute this value.

         *   the <a href="#MaximumOpacity">maximum obscuring opacity</a>. See section

         *   <a href="#ObscuringOpacity">Combined obscuring opacity</a> below on how to compute this

         *   value.

         * </ol>

         * <p>If none of these cases hold, the touch will not be delivered and a message will be

         * logged to logcat.</p>

         *

         * <a name="MaximumOpacity"></a>

         * <h3>Maximum obscuring opacity</h3>

         * <p>This value is <b>0.8</b>. Apps that want to gather this value from the system rather

         * than hard-coding it might want to use {@link

         * android.hardware.input.InputManager#getMaximumObscuringOpacityForTouch()}.</p>

         *

         * <a name="ObscuringOpacity"></a>

         * <h3>Combined obscuring opacity</h3>

         *