PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add INTENT_ONLY as a ResultPayload Availibility

Browse Source 
Manual merge after a merge conflict.

Test: robotests
Bug: 64165583
Change-Id: I6eab018dc4065ceefdba2039a5842945e2f76a75
This commit is contained in:
Matthew Fritze
2017-07-31 08:18:20 -07:00
parent 48f8ab9bc9
commit a35320ce3b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/search/ResultPayload.java
View File

@@ -69,7 +69,8 @@ public class ResultPayload implements Parcelable {
Availability.DISABLED_DEPENDENT_SETTING, Availability.DISABLED_DEPENDENT_SETTING,
Availability.DISABLED_DEPENDENT_APP, Availability.DISABLED_DEPENDENT_APP,
Availability.DISABLED_UNSUPPORTED, Availability.DISABLED_UNSUPPORTED,
Availability.RESOURCE_CONTENTION}) Availability.RESOURCE_CONTENTION,
Availability.INTENT_ONLY,})
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface Availability { public @interface Availability {
/** /**
@@ -98,6 +99,11 @@ public class ResultPayload implements Parcelable {
* The setting is disabled because corresponding app is disabled * The setting is disabled because corresponding app is disabled
*/ */
int DISABLED_DEPENDENT_APP = 4; 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, @IntDef({SettingsSource.UNKNOWN, SettingsSource.SYSTEM, SettingsSource.SECURE,