diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-05-19 04:40:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-19 04:40:15 +0000 |
| commit | c6767354c5c2e32648c7404b73878a8ae66dd3c8 (patch) | |
| tree | 8c76c34ea2b2018629ba5e22c9f5f3744a3e44fb /core/java | |
| parent | 2b0196a7d3d6c952c8df17acd9fcdf61ec735b5c (diff) | |
| parent | 9d91083034654b37461c891308a1d426054170a8 (diff) | |
| download | frameworks_base-c6767354c5c2e32648c7404b73878a8ae66dd3c8.zip frameworks_base-c6767354c5c2e32648c7404b73878a8ae66dd3c8.tar.gz frameworks_base-c6767354c5c2e32648c7404b73878a8ae66dd3c8.tar.bz2 | |
Merge "Add setting to disable assist data (1/2)" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/logging/MetricsConstants.java | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ef0dc3e..37645b5 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5417,6 +5417,14 @@ public final class Settings { public static final String EMERGENCY_ASSISTANCE_APPLICATION = "emergency_assistance_application"; /** + * Specifies whether the current app context on scren (assist data) will be sent to the + * assist application (active voice interaction service). + * + * @hide + */ + public static final String ASSIST_STRUCTURE_ENABLED = "assist_structure_enabled"; + + /** * Names of the packages that the current user has explicitly allowed to * see all of the user's notifications, separated by ':'. * diff --git a/core/java/com/android/internal/logging/MetricsConstants.java b/core/java/com/android/internal/logging/MetricsConstants.java index 65dc743..b9a75d3 100644 --- a/core/java/com/android/internal/logging/MetricsConstants.java +++ b/core/java/com/android/internal/logging/MetricsConstants.java @@ -208,6 +208,7 @@ public interface MetricsConstants { public static final int APPLICATIONS_USAGE_ACCESS_DETAIL = 183; public static final int APPLICATIONS_HIGH_POWER_APPS = 184; public static final int FUELGAUGE_HIGH_POWER_DETAILS = 185; + public static final int APPLICATIONS_MANAGE_ASSIST = 186; //aliases public static final int DEVICEINFO_STORAGE = DEVICEINFO_MEMORY; |