Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a5ee7b3 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31154470',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31154470', 'googleplex-android-review.googlesource.com/31569659'] into sparse-13010343-L69700030009374823.
SPARSE_CHANGE: I9a5a75420a76ff0aefab2e2f9b14770fd7b2ad7a
SPARSE_CHANGE: Ie732cbab915573f8693ca3ddc83a25e044a96cbf

Change-Id: I4f85ab429ca9e56561c932e7a9e6c7a9b68c80ec
parents 2c22b745 f61ad615

packages/SystemUI/src/com/android/systemui/education/data/repository/UserContextualEducationRepository.kt

+14 −10
Original line number Diff line number Diff line
@@ -20,10 +20,12 @@ import android.content.Context 
import android.hardware.input.InputManager

import android.hardware.input.KeyGestureEvent

import androidx.datastore.core.DataStore

import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler

import androidx.datastore.preferences.core.MutablePreferences

import androidx.datastore.preferences.core.PreferenceDataStoreFactory

import androidx.datastore.preferences.core.Preferences

import androidx.datastore.preferences.core.edit

import androidx.datastore.preferences.core.emptyPreferences

import androidx.datastore.preferences.core.intPreferencesKey

import androidx.datastore.preferences.core.longPreferencesKey

import androidx.datastore.preferences.preferencesDataStoreFile
@@ -68,7 +70,7 @@ interface ContextualEducationRepository { 


    suspend fun updateGestureEduModel(

        gestureType: GestureType,

        transform: (GestureEduModel) -> GestureEduModel

        transform: (GestureEduModel) -> GestureEduModel,

    )



    suspend fun updateEduDeviceConnectionTime(
@@ -149,6 +151,8 @@ constructor( 
                        String.format(DATASTORE_DIR, userId)

                    )

                },

                corruptionHandler =

                    ReplaceFileCorruptionHandler(produceNewData = { emptyPreferences() }),

                scope = newDsScope,

            )

        dataStoreScope = newDsScope
@@ -159,7 +163,7 @@ constructor( 


    private fun getGestureEduModel(

        gestureType: GestureType,

        preferences: Preferences

        preferences: Preferences,

    ): GestureEduModel {

        return GestureEduModel(

            signalCount = preferences[getSignalCountKey(gestureType)] ?: 0,
@@ -183,7 +187,7 @@ constructor( 


    override suspend fun updateGestureEduModel(

        gestureType: GestureType,

        transform: (GestureEduModel) -> GestureEduModel

        transform: (GestureEduModel) -> GestureEduModel,

    ) {

        datastore.filterNotNull().first().edit { preferences ->

            val currentModel = getGestureEduModel(gestureType, preferences)
@@ -193,17 +197,17 @@ constructor( 
            setInstant(

                preferences,

                updatedModel.lastShortcutTriggeredTime,

                getLastShortcutTriggeredTimeKey(gestureType)

                getLastShortcutTriggeredTimeKey(gestureType),

            )

            setInstant(

                preferences,

                updatedModel.usageSessionStartTime,

                getUsageSessionStartTimeKey(gestureType)

                getUsageSessionStartTimeKey(gestureType),

            )

            setInstant(

                preferences,

                updatedModel.lastEducationTime,

                getLastEducationTimeKey(gestureType)

                getLastEducationTimeKey(gestureType),

            )

        }

    }
@@ -220,12 +224,12 @@ constructor( 
            setInstant(

                preferences,

                updatedModel.keyboardFirstConnectionTime,

                getKeyboardFirstConnectionTimeKey()

                getKeyboardFirstConnectionTimeKey(),

            )

            setInstant(

                preferences,

                updatedModel.touchpadFirstConnectionTime,

                getTouchpadFirstConnectionTimeKey()

                getTouchpadFirstConnectionTimeKey(),

            )

        }

    }
@@ -235,7 +239,7 @@ constructor( 
            keyboardFirstConnectionTime =

                preferences[getKeyboardFirstConnectionTimeKey()]?.let { Instant.ofEpochSecond(it) },

            touchpadFirstConnectionTime =

                preferences[getTouchpadFirstConnectionTimeKey()]?.let { Instant.ofEpochSecond(it) }

                preferences[getTouchpadFirstConnectionTimeKey()]?.let { Instant.ofEpochSecond(it) },

        )

    }
@@ -263,7 +267,7 @@ constructor( 
    private fun setInstant(

        preferences: MutablePreferences,

        instant: Instant?,

        key: Preferences.Key<Long>

        key: Preferences.Key<Long>,

    ) {

        if (instant != null) {

            // Use epochSecond because an instant is defined as a signed long (64bit number) of

packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/data/repository/TutorialSchedulerRepository.kt

+8 −1
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ package com.android.systemui.inputdevice.tutorial.data.repository 


import android.content.Context

import androidx.datastore.core.DataStore

import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler

import androidx.datastore.preferences.core.Preferences

import androidx.datastore.preferences.core.edit

import androidx.datastore.preferences.core.emptyPreferences

import androidx.datastore.preferences.core.longPreferencesKey

import androidx.datastore.preferences.preferencesDataStore

import com.android.systemui.dagger.SysUISingleton
@@ -45,7 +47,12 @@ class TutorialSchedulerRepository( 
    ) : this(applicationContext, backgroundScope, dataStoreName = DATASTORE_NAME)



    private val Context.dataStore: DataStore<Preferences> by

        preferencesDataStore(name = dataStoreName, scope = backgroundScope)

        preferencesDataStore(

            name = dataStoreName,

            corruptionHandler =

                ReplaceFileCorruptionHandler(produceNewData = { emptyPreferences() }),

            scope = backgroundScope,

        )



    suspend fun isLaunched(deviceType: DeviceType): Boolean = loadData()[deviceType]!!.isLaunched