Merge pull request #489 from RADAR-base/new-usage-events

Extend phone usage event types

Author: this-Aditya

gradle.properties

@@ -16,7 +16,7 @@ org.gradle.jvmargs=-Xmx3072m -XX:MaxMetaspaceSize=1536m -Dfile.encoding=UTF-8 -X
 org.gradle.parallel=true
 org.gradle.vfs.watch=true
 kotlin.code.style=official
-android.jetifier.ignorelist=jackson-core-2.16.1.jar
+android.jetifier.ignorelist=jackson-core-2.16.1.jar, jackson-core-2.17.3.jar
 android.defaults.buildfeatures.buildconfig=true
 
 # When configured, Gradle will run in incubating parallel mode.
@@ -38,7 +38,7 @@ publish_plugin_version=2.0.0
 versions_plugin_version=0.51.0
 
 radar_commons_version=0.15.0
-radar_schemas_commons_version=0.8.11
+radar_schemas_commons_version=0.8.15
 
 radar_faros_sdk_version=0.1.0
 

plugins/radar-android-phone-usage/src/main/java/org/radarbase/passive/phone/usage/PhoneUsageManager.kt

@@ -171,9 +171,17 @@ class PhoneUsageManager(context: PhoneUsageService) : AbstractSourceManager<Phon
         val usageEventType = when (lastEventType) {
             ACTIVITY_RESUMED -> UsageEventType.FOREGROUND
             ACTIVITY_PAUSED -> UsageEventType.BACKGROUND
+            ACTIVITY_STOPPED -> UsageEventType.STOPPED
+            FOREGROUND_SERVICE_START -> UsageEventType.FOREGROUND_SERVICE_START
+            FOREGROUND_SERVICE_STOP -> UsageEventType.FOREGROUND_SERVICE_STOP
+            KEYGUARD_SHOWN -> UsageEventType.KEYGUARD_SHOWN
+            KEYGUARD_HIDDEN -> UsageEventType.KEYGUARD_HIDDEN
             CONFIGURATION_CHANGE -> UsageEventType.CONFIG
             SHORTCUT_INVOCATION_COMPAT -> UsageEventType.SHORTCUT
             USER_INTERACTION -> UsageEventType.INTERACTION
+            SCREEN_INTERACTIVE -> UsageEventType.SCREEN_INTERACTIVE
+            SCREEN_NON_INTERACTIVE -> UsageEventType.SCREEN_NON_INTERACTIVE
+            STANDBY_BUCKET_CHANGED -> UsageEventType.STANDBY_BUCKET_CHANGED
             else -> UsageEventType.OTHER
         }