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

Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Matthew Fritze
2017-08-01 00:28:57 +00:00
committed by Android (Google) Code Review
parent 666d70ea76 57b641eee8
commit 7907bd215d
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,