Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Controls API - Add support for routines" into rvc-dev am: 780782b750

Browse Source 
Change-Id: Ia7cc144f3d14cd8d94ee584fb3fb06e1dd01edb8
This commit is contained in:
Automerger Merge Worker
2020-03-06 14:56:00 +00:00
parent 64e0da564d 780782b750
commit 41245fd2a0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -43513,6 +43513,7 @@ package android.service.controls {
field public static final int TYPE_RADIATOR = 16; // 0x10 field public static final int TYPE_RADIATOR = 16; // 0x10
field public static final int TYPE_REFRIGERATOR = 48; // 0x30 field public static final int TYPE_REFRIGERATOR = 48; // 0x30
field public static final int TYPE_REMOTE_CONTROL = 17; // 0x11 field public static final int TYPE_REMOTE_CONTROL = 17; // 0x11
field public static final int TYPE_ROUTINE = 52; // 0x34
field public static final int TYPE_SECURITY_SYSTEM = 46; // 0x2e field public static final int TYPE_SECURITY_SYSTEM = 46; // 0x2e
field public static final int TYPE_SET_TOP = 18; // 0x12 field public static final int TYPE_SET_TOP = 18; // 0x12
field public static final int TYPE_SHOWER = 29; // 0x1d field public static final int TYPE_SHOWER = 29; // 0x1d

10
core/java/android/service/controls/DeviceTypes.java
View File

@@ -27,7 +27,7 @@ import java.lang.annotation.RetentionPolicy;
public class DeviceTypes { public class DeviceTypes {
// Update this when adding new concrete types. Does not count TYPE_UNKNOWN // Update this when adding new concrete types. Does not count TYPE_UNKNOWN
private static final int NUM_CONCRETE_TYPES = 51; private static final int NUM_CONCRETE_TYPES = 52;
public static final @DeviceType int TYPE_UNKNOWN = 0; public static final @DeviceType int TYPE_UNKNOWN = 0;
public static final @DeviceType int TYPE_AC_HEATER = 1; public static final @DeviceType int TYPE_AC_HEATER = 1;
@@ -87,6 +87,11 @@ public class DeviceTypes {
public static final @DeviceType int TYPE_CAMERA = 50; public static final @DeviceType int TYPE_CAMERA = 50;
public static final @DeviceType int TYPE_DOORBELL = 51; public static final @DeviceType int TYPE_DOORBELL = 51;
/*
* Also known as macros, routines can aggregate a series of actions across multiple devices
*/
public static final @DeviceType int TYPE_ROUTINE = 52;
// Update this when adding new generic types. // Update this when adding new generic types.
private static final int NUM_GENERIC_TYPES = 7; private static final int NUM_GENERIC_TYPES = 7;
public static final @DeviceType int TYPE_GENERIC_ON_OFF = -1; public static final @DeviceType int TYPE_GENERIC_ON_OFF = -1;
@@ -165,7 +170,8 @@ public class DeviceTypes {
TYPE_REFRIGERATOR, TYPE_REFRIGERATOR,
TYPE_THERMOSTAT, TYPE_THERMOSTAT,
TYPE_CAMERA, TYPE_CAMERA,
TYPE_DOORBELL TYPE_DOORBELL,
TYPE_ROUTINE
}) })
public @interface DeviceType {} public @interface DeviceType {}