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

Commit 580a71bc authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

Apply new code formatting to SettingsProxy 

Apply ktfmt 0.52 formatting to SettingsProxy and associated files

Test: atest SystemUITests
Flag: EXEMPT Code formatting
Change-Id: Ie74ac4da60f8460bb42ee453a647c64b3c3b5830
parent df7fdd86

packages/SystemUI/multivalentTests/src/com/android/systemui/util/settings/SettingsProxyTest.kt

+8 −8
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ class SettingsProxyTest : SysuiTestCase() { 
            mSettings.registerContentObserverSync(

                TEST_SETTING,

                notifyForDescendants = true,

                mContentObserver

                mContentObserver,

            )

            verify(mSettings.getContentResolver())

                .registerContentObserver(eq(TEST_SETTING_URI), eq(true), eq(mContentObserver))
@@ -104,7 +104,7 @@ class SettingsProxyTest : SysuiTestCase() { 
            mSettings.registerContentObserver(

                TEST_SETTING,

                notifyForDescendants = true,

                mContentObserver

                mContentObserver,

            )

            verify(mSettings.getContentResolver())

                .registerContentObserver(eq(TEST_SETTING_URI), eq(true), eq(mContentObserver))
@@ -116,7 +116,7 @@ class SettingsProxyTest : SysuiTestCase() { 
            mSettings.registerContentObserverAsync(

                TEST_SETTING,

                notifyForDescendants = true,

                mContentObserver

                mContentObserver,

            )

            testScope.advanceUntilIdle()

            verify(mSettings.getContentResolver())
@@ -154,7 +154,7 @@ class SettingsProxyTest : SysuiTestCase() { 
            mSettings.registerContentObserverSync(

                TEST_SETTING_URI,

                notifyForDescendants = true,

                mContentObserver

                mContentObserver,

            )

            verify(mSettings.getContentResolver())

                .registerContentObserver(eq(TEST_SETTING_URI), eq(true), eq(mContentObserver))
@@ -166,7 +166,7 @@ class SettingsProxyTest : SysuiTestCase() { 
            mSettings.registerContentObserver(

                TEST_SETTING_URI,

                notifyForDescendants = true,

                mContentObserver

                mContentObserver,

            )

            verify(mSettings.getContentResolver())

                .registerContentObserver(eq(TEST_SETTING_URI), eq(true), eq(mContentObserver))
@@ -178,7 +178,7 @@ class SettingsProxyTest : SysuiTestCase() { 
            mSettings.registerContentObserverAsync(

                TEST_SETTING_URI,

                notifyForDescendants = true,

                mContentObserver

                mContentObserver,

            )

            testScope.advanceUntilIdle()

            verify(mSettings.getContentResolver())
@@ -202,7 +202,7 @@ class SettingsProxyTest : SysuiTestCase() { 
                    TEST_SETTING_URI,

                    false,

                    mContentObserver,

                    it

                    it,

                )

            }

        }
@@ -408,7 +408,7 @@ class SettingsProxyTest : SysuiTestCase() { 
            name: String,

            value: String?,

            tag: String?,

            makeDefault: Boolean

            makeDefault: Boolean,

        ): Boolean {

            settingToValueMap[name] = value

            return true

packages/SystemUI/multivalentTests/src/com/android/systemui/util/settings/UserSettingsProxyTest.kt

+32 −34
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(false),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -82,7 +82,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(false),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -96,7 +96,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(false),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -107,14 +107,14 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                TEST_SETTING,

                notifyForDescendants = true,

                mContentObserver,

                userId

                userId,

            )

            verify(mSettings.getContentResolver())

                .registerContentObserver(

                    eq(TEST_SETTING_URI),

                    eq(true),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -125,16 +125,14 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                TEST_SETTING,

                notifyForDescendants = true,

                mContentObserver,

                userId

                userId,

            )

            verify(mSettings.getContentResolver())

                .registerContentObserver(

                    eq(TEST_SETTING_URI),

                    eq(

                        true,

                    ),

                    eq(true),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -145,7 +143,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                TEST_SETTING,

                notifyForDescendants = true,

                mContentObserver,

                userId

                userId,

            )

            testScope.advanceUntilIdle()

            verify(mSettings.getContentResolver())
@@ -153,7 +151,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(true),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -166,7 +164,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(false),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -179,7 +177,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(false),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -189,7 +187,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
            mSettings.registerContentObserverForUserAsync(

                TEST_SETTING_URI,

                mContentObserver,

                userId

                userId,

            )

            testScope.advanceUntilIdle()
@@ -198,7 +196,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(false),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -213,7 +211,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                TEST_SETTING_URI,

                mContentObserver,

                userId,

                runnable

                runnable,

            )

            testScope.advanceUntilIdle()

            assertThat(callbackCalled).isTrue()
@@ -226,14 +224,14 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                TEST_SETTING_URI,

                notifyForDescendants = true,

                mContentObserver,

                userId

                userId,

            )

            verify(mSettings.getContentResolver())

                .registerContentObserver(

                    eq(TEST_SETTING_URI),

                    eq(true),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -244,14 +242,14 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                TEST_SETTING_URI,

                notifyForDescendants = true,

                mContentObserver,

                userId

                userId,

            )

            verify(mSettings.getContentResolver())

                .registerContentObserver(

                    eq(TEST_SETTING_URI),

                    eq(true),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -262,7 +260,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                TEST_SETTING_URI,

                notifyForDescendants = true,

                mContentObserver,

                userId

                userId,

            )

            testScope.advanceUntilIdle()

            verify(mSettings.getContentResolver())
@@ -270,7 +268,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(true),

                    eq(mContentObserver),

                    eq(MAIN_USER_ID)

                    eq(MAIN_USER_ID),

                )

        }
@@ -283,7 +281,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(false),

                    eq(mContentObserver),

                    eq(0)

                    eq(0),

                )

        }
@@ -296,7 +294,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(false),

                    eq(mContentObserver),

                    eq(0)

                    eq(0),

                )

        }
@@ -309,7 +307,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(false),

                    eq(mContentObserver),

                    eq(0)

                    eq(0),

                )

        }

    }
@@ -320,14 +318,14 @@ class UserSettingsProxyTest : SysuiTestCase() { 
            mSettings.registerContentObserverSync(

                TEST_SETTING_URI,

                notifyForDescendants = true,

                mContentObserver

                mContentObserver,

            )

            verify(mSettings.getContentResolver())

                .registerContentObserver(

                    eq(TEST_SETTING_URI),

                    eq(true),

                    eq(mContentObserver),

                    eq(0)

                    eq(0),

                )

        }
@@ -340,7 +338,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                    eq(TEST_SETTING_URI),

                    eq(false),

                    eq(mContentObserver),

                    eq(0)

                    eq(0),

                )

        }
@@ -354,7 +352,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
                        eq(TEST_SETTING_URI),

                        eq(false),

                        eq(mContentObserver),

                        eq(0)

                        eq(0),

                    )

            }

        }
@@ -557,7 +555,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
     */

    private class FakeUserSettingsProxy(

        override val currentUserProvider: SettingsProxy.CurrentUserIdProvider,

        val testDispatcher: CoroutineDispatcher

        val testDispatcher: CoroutineDispatcher,

    ) : UserSettingsProxy {



        private val mContentResolver = mock(ContentResolver::class.java)
@@ -578,7 +576,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
        override fun putString(

            name: String,

            value: String?,

            overrideableByRestore: Boolean

            overrideableByRestore: Boolean,

        ): Boolean {

            userIdToSettingsValueMap[DEFAULT_USER_ID]?.put(name, value)

            return true
@@ -588,7 +586,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
            name: String,

            value: String?,

            tag: String?,

            makeDefault: Boolean

            makeDefault: Boolean,

        ): Boolean {

            putStringForUser(name, value, DEFAULT_USER_ID)

            return true
@@ -605,7 +603,7 @@ class UserSettingsProxyTest : SysuiTestCase() { 
            tag: String?,

            makeDefault: Boolean,

            userHandle: Int,

            overrideableByRestore: Boolean

            overrideableByRestore: Boolean,

        ): Boolean {

            userIdToSettingsValueMap[userHandle]?.set(name, value)

            return true

packages/SystemUI/pods/com/android/systemui/util/settings/SettingsProxy.kt

+4 −4
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ import android.provider.Settings.SettingNotFoundException 
import androidx.annotation.AnyThread

import androidx.annotation.WorkerThread

import com.android.app.tracing.TraceUtils.trace

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.systemui.coroutines.newTracingContext

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

import com.android.app.tracing.coroutines.launchTraced as launch

import kotlinx.coroutines.withContext



/**
@@ -188,7 +188,7 @@ interface SettingsProxy { 
    suspend fun registerContentObserver(

        name: String,

        notifyForDescendants: Boolean,

        settingsObserver: ContentObserver

        settingsObserver: ContentObserver,

    ) {

        withContext(backgroundDispatcher) {

            registerContentObserverSync(getUriFor(name), notifyForDescendants, settingsObserver)
@@ -239,7 +239,7 @@ interface SettingsProxy { 
    fun registerContentObserverSync(

        uri: Uri,

        notifyForDescendants: Boolean,

        settingsObserver: ContentObserver

        settingsObserver: ContentObserver,

    ) {

        trace({ "SP#registerObserver#[$uri]" }) {

            getContentResolver()
@@ -257,7 +257,7 @@ interface SettingsProxy { 
    suspend fun registerContentObserver(

        uri: Uri,

        notifyForDescendants: Boolean,

        settingsObserver: ContentObserver

        settingsObserver: ContentObserver,

    ) {

        withContext(backgroundDispatcher) {

            registerContentObserverSync(uri, notifyForDescendants, settingsObserver)

packages/SystemUI/pods/com/android/systemui/util/settings/UserSettingsProxy.kt

+15 −15
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ import android.net.Uri 
import android.os.UserHandle

import android.provider.Settings.SettingNotFoundException

import com.android.app.tracing.TraceUtils.trace

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.systemui.coroutines.newTracingContext

import com.android.systemui.util.settings.SettingsProxy.Companion.parseFloat

import com.android.systemui.util.settings.SettingsProxy.Companion.parseFloatOrThrow

import com.android.systemui.util.settings.SettingsProxy.Companion.parseLongOrThrow

import com.android.systemui.util.settings.SettingsProxy.Companion.parseLongOrUseDefault

import kotlinx.coroutines.CoroutineScope

import com.android.app.tracing.coroutines.launchTraced as launch

import kotlinx.coroutines.withContext



/**
@@ -96,7 +96,7 @@ interface UserSettingsProxy : SettingsProxy { 
    override suspend fun registerContentObserver(

        uri: Uri,

        notifyForDescendants: Boolean,

        settingsObserver: ContentObserver

        settingsObserver: ContentObserver,

    ) {

        withContext(backgroundDispatcher) {

            registerContentObserverForUserSync(uri, notifyForDescendants, settingsObserver, userId)
@@ -126,7 +126,7 @@ interface UserSettingsProxy : SettingsProxy { 
    fun registerContentObserverForUserSync(

        name: String,

        settingsObserver: ContentObserver,

        userHandle: Int

        userHandle: Int,

    ) {

        registerContentObserverForUserSync(getUriFor(name), settingsObserver, userHandle)

    }
@@ -141,7 +141,7 @@ interface UserSettingsProxy : SettingsProxy { 
    suspend fun registerContentObserverForUser(

        name: String,

        settingsObserver: ContentObserver,

        userHandle: Int

        userHandle: Int,

    ) {

        withContext(backgroundDispatcher) {

            registerContentObserverForUserSync(name, settingsObserver, userHandle)
@@ -167,7 +167,7 @@ interface UserSettingsProxy : SettingsProxy { 
    fun registerContentObserverForUserSync(

        uri: Uri,

        settingsObserver: ContentObserver,

        userHandle: Int

        userHandle: Int,

    ) {

        registerContentObserverForUserSync(uri, false, settingsObserver, userHandle)

    }
@@ -182,7 +182,7 @@ interface UserSettingsProxy : SettingsProxy { 
    suspend fun registerContentObserverForUser(

        uri: Uri,

        settingsObserver: ContentObserver,

        userHandle: Int

        userHandle: Int,

    ) {

        withContext(backgroundDispatcher) {

            registerContentObserverForUserSync(uri, settingsObserver, userHandle)
@@ -231,13 +231,13 @@ interface UserSettingsProxy : SettingsProxy { 
        name: String,

        notifyForDescendants: Boolean,

        settingsObserver: ContentObserver,

        userHandle: Int

        userHandle: Int,

    ) {

        registerContentObserverForUserSync(

            getUriFor(name),

            notifyForDescendants,

            settingsObserver,

            userHandle

            userHandle,

        )

    }
@@ -252,14 +252,14 @@ interface UserSettingsProxy : SettingsProxy { 
        name: String,

        notifyForDescendants: Boolean,

        settingsObserver: ContentObserver,

        userHandle: Int

        userHandle: Int,

    ) {

        withContext(backgroundDispatcher) {

            registerContentObserverForUserSync(

                name,

                notifyForDescendants,

                settingsObserver,

                userHandle

                userHandle,

            )

        }

    }
@@ -291,7 +291,7 @@ interface UserSettingsProxy : SettingsProxy { 
        uri: Uri,

        notifyForDescendants: Boolean,

        settingsObserver: ContentObserver,

        userHandle: Int

        userHandle: Int,

    ) {

        trace({ "USP#registerObserver#[$uri]" }) {

            getContentResolver()
@@ -299,7 +299,7 @@ interface UserSettingsProxy : SettingsProxy { 
                    uri,

                    notifyForDescendants,

                    settingsObserver,

                    getRealUserHandle(userHandle)

                    getRealUserHandle(userHandle),

                )

            Unit

        }
@@ -316,14 +316,14 @@ interface UserSettingsProxy : SettingsProxy { 
        uri: Uri,

        notifyForDescendants: Boolean,

        settingsObserver: ContentObserver,

        userHandle: Int

        userHandle: Int,

    ) {

        withContext(backgroundDispatcher) {

            registerContentObserverForUserSync(

                uri,

                notifyForDescendants,

                settingsObserver,

                getRealUserHandle(userHandle)

                getRealUserHandle(userHandle),

            )

        }

    }
@@ -385,7 +385,7 @@ interface UserSettingsProxy : SettingsProxy { 
        tag: String?,

        makeDefault: Boolean,

        @UserIdInt userHandle: Int,

        overrideableByRestore: Boolean

        overrideableByRestore: Boolean,

    ): Boolean



    override fun getInt(name: String, default: Int): Int {

packages/SystemUI/src/com/android/systemui/util/kotlin/SysUICoroutinesModule.kt

+7 −8
Original line number Diff line number Diff line
@@ -20,11 +20,12 @@ import android.os.Handler 
import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Tracing

import com.android.systemui.dagger.qualifiers.UiBackground

import com.android.systemui.util.settings.SettingsSingleThreadBackground

import dagger.Module

import dagger.Provides

import java.util.concurrent.Executor

import kotlin.coroutines.CoroutineContext

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.DelicateCoroutinesApi
@@ -33,8 +34,6 @@ import kotlinx.coroutines.android.asCoroutineDispatcher 
import kotlinx.coroutines.asCoroutineDispatcher

import kotlinx.coroutines.newFixedThreadPoolContext

import kotlinx.coroutines.plus

import java.util.concurrent.Executor

import kotlin.coroutines.CoroutineContext



private const val LIMIT_BACKGROUND_DISPATCHER_THREADS = true
@@ -62,7 +61,7 @@ class SysUICoroutinesModule { 
    @Background

    @Deprecated(

        "Use @Background CoroutineContext instead",

        ReplaceWith("bgCoroutineContext()", "kotlin.coroutines.CoroutineContext")

        ReplaceWith("bgCoroutineContext()", "kotlin.coroutines.CoroutineContext"),

    )

    fun bgDispatcher(): CoroutineDispatcher {

        return if (LIMIT_BACKGROUND_DISPATCHER_THREADS) {
@@ -73,7 +72,7 @@ class SysUICoroutinesModule { 
            // code on those.

            newFixedThreadPoolContext(

                nThreads = Runtime.getRuntime().availableProcessors(),

                name = "SystemUIBg"

                name = "SystemUIBg",

            )

        } else {

            Dispatchers.IO
@@ -92,7 +91,7 @@ class SysUICoroutinesModule { 
    @Background

    @SysUISingleton

    fun bgCoroutineContext(

        @Background bgCoroutineDispatcher: CoroutineDispatcher,

        @Background bgCoroutineDispatcher: CoroutineDispatcher

    ): CoroutineContext {

        return bgCoroutineDispatcher

    }
@@ -103,7 +102,7 @@ class SysUICoroutinesModule { 
    @UiBackground

    @Deprecated(

        "Use @UiBackground CoroutineContext instead",

        ReplaceWith("uiBgCoroutineContext()", "kotlin.coroutines.CoroutineContext")

        ReplaceWith("uiBgCoroutineContext()", "kotlin.coroutines.CoroutineContext"),

    )

    fun uiBgDispatcher(@UiBackground uiBgExecutor: Executor): CoroutineDispatcher =

        uiBgExecutor.asCoroutineDispatcher()
@@ -112,7 +111,7 @@ class SysUICoroutinesModule { 
    @UiBackground

    @SysUISingleton

    fun uiBgCoroutineContext(

        @UiBackground uiBgCoroutineDispatcher: CoroutineDispatcher,

        @UiBackground uiBgCoroutineDispatcher: CoroutineDispatcher

    ): CoroutineContext {

        return uiBgCoroutineDispatcher

    }