From e1ff28dabcda0e5cbc13a4ca97ef9a4e4138ec0e Mon Sep 17 00:00:00 2001 From: Matt Casey Date: Tue, 18 Jun 2019 17:58:44 -0400 Subject: [PATCH] Add ASSIST_TAP_PASSTHROUGH flag. Make PhenotypeHelper public. Bug: 135459244 Test: Manual via adb Change-Id: I039552bdfde1b0c3ff481af5b4f8813091112391 --- .../config/sysui/SystemUiDeviceConfigFlags.java | 7 ++++++- .../android/systemui/assist/PhenotypeHelper.java | 14 +++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java index 3475b61597bd6..55c24eb3e9977 100644 --- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java +++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java @@ -113,7 +113,7 @@ public final class SystemUiDeviceConfigFlags { */ public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled"; - // Flags related to Assistant Handles + // Flags related to Assistant /** * (String) Which behavior mode for the Assistant Handles to use. @@ -190,5 +190,10 @@ public final class SystemUiDeviceConfigFlags { public static final String ASSIST_HANDLES_SUPPRESS_ON_APPS = "assist_handles_suppress_on_apps"; + /** + * Allow touch passthrough above assist area during a session. + */ + public static final String ASSIST_TAP_PASSTHROUGH = "assist_tap_passthrough"; + private SystemUiDeviceConfigFlags() { } } diff --git a/packages/SystemUI/src/com/android/systemui/assist/PhenotypeHelper.java b/packages/SystemUI/src/com/android/systemui/assist/PhenotypeHelper.java index 61395f158aea8..b3f57afc0753a 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/PhenotypeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/assist/PhenotypeHelper.java @@ -22,28 +22,28 @@ import androidx.annotation.Nullable; import java.util.concurrent.Executor; -class PhenotypeHelper { +public class PhenotypeHelper { - PhenotypeHelper() {} + public PhenotypeHelper() {} - long getLong(String name, long defaultValue) { + public long getLong(String name, long defaultValue) { return DeviceConfig.getLong(DeviceConfig.NAMESPACE_SYSTEMUI, name, defaultValue); } - int getInt(String name, int defaultValue) { + public int getInt(String name, int defaultValue) { return DeviceConfig.getInt(DeviceConfig.NAMESPACE_SYSTEMUI, name, defaultValue); } @Nullable - String getString(String name, @Nullable String defaultValue) { + public String getString(String name, @Nullable String defaultValue) { return DeviceConfig.getString(DeviceConfig.NAMESPACE_SYSTEMUI, name, defaultValue); } - boolean getBoolean(String name, boolean defaultValue) { + public boolean getBoolean(String name, boolean defaultValue) { return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI, name, defaultValue); } - void addOnPropertiesChangedListener( + public void addOnPropertiesChangedListener( Executor executor, DeviceConfig.OnPropertiesChangedListener listener) { DeviceConfig.addOnPropertiesChangedListener( DeviceConfig.NAMESPACE_SYSTEMUI, executor, listener);