From a35320ce3bd147acdee9ea7c31255c72844cf2fa Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Mon, 31 Jul 2017 08:18:20 -0700 Subject: [PATCH] Add INTENT_ONLY as a ResultPayload Availibility Manual merge after a merge conflict. Test: robotests Bug: 64165583 Change-Id: I6eab018dc4065ceefdba2039a5842945e2f76a75 --- src/com/android/settings/search/ResultPayload.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/search/ResultPayload.java b/src/com/android/settings/search/ResultPayload.java index 048c172b4a1..3035eeb7572 100644 --- a/src/com/android/settings/search/ResultPayload.java +++ b/src/com/android/settings/search/ResultPayload.java @@ -69,7 +69,8 @@ public class ResultPayload implements Parcelable { Availability.DISABLED_DEPENDENT_SETTING, Availability.DISABLED_DEPENDENT_APP, Availability.DISABLED_UNSUPPORTED, - Availability.RESOURCE_CONTENTION}) + Availability.RESOURCE_CONTENTION, + Availability.INTENT_ONLY,}) @Retention(RetentionPolicy.SOURCE) public @interface Availability { /** @@ -98,6 +99,11 @@ public class ResultPayload implements Parcelable { * The setting is disabled because corresponding app is disabled */ int DISABLED_DEPENDENT_APP = 4; + + /** + * This setting is supported on the device but cannot be changed inline. + */ + int INTENT_ONLY = 5; } @IntDef({SettingsSource.UNKNOWN, SettingsSource.SYSTEM, SettingsSource.SECURE,