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

Commit b0c7563c authored by Kangping Dong's avatar Kangping Dong Committed by Automerger Merge Worker
Browse files

Merge "[Thread] use dedicated flag for Thread settings" into main am: 33722b51 am: c19a1094 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3002558



Change-Id: I1c28a4a870b8ded5aad1b32e1e4e7f505d580138
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d5f125c c19a1094

aconfig/settings_threadnetwork_flag_declarations.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.settings.flags"



flag {

    name: "thread_settings_enabled"

    namespace: "thread_network"

    description: "Controls whether the Thread Settings UX is displayed"

    bug: "329384658"

}

src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt

+2 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ import androidx.lifecycle.LifecycleEventObserver 
import androidx.lifecycle.LifecycleOwner

import androidx.preference.Preference

import androidx.preference.PreferenceScreen

import com.android.net.thread.platform.flags.Flags

import com.android.settings.R

import com.android.settings.core.TogglePreferenceController

import com.android.settings.flags.Flags

import java.util.concurrent.Executor



/** Controller for the "Thread" toggle in "Connected devices > Connection preferences".  */
@@ -110,7 +110,7 @@ class ThreadNetworkPreferenceController @VisibleForTesting constructor( 
    }



    override fun getAvailabilityStatus(): Int {

        return if (!Flags.threadEnabledPlatform()) {

        return if (!Flags.threadSettingsEnabled()) {

            CONDITIONALLY_UNAVAILABLE

        } else if (!isThreadSupportedOnDevice) {

            UNSUPPORTED_ON_DEVICE

tests/unit/src/com/android/settings/conecteddevice/threadnetwork/ThreadNetworkPreferenceControllerTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -33,13 +33,13 @@ import androidx.preference.PreferenceManager 
import androidx.preference.SwitchPreference

import androidx.test.core.app.ApplicationProvider

import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.net.thread.platform.flags.Flags

import com.android.settings.R

import com.android.settings.core.BasePreferenceController.AVAILABLE

import com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE

import com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING

import com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE

import com.android.settings.connecteddevice.threadnetwork.ThreadNetworkPreferenceController.BaseThreadNetworkController

import com.android.settings.flags.Flags

import com.google.common.truth.Truth.assertThat

import org.junit.Before

import org.junit.Rule
@@ -68,7 +68,7 @@ class ThreadNetworkPreferenceControllerTest { 


    @Before

    fun setUp() {

        mSetFlagsRule.enableFlags(Flags.FLAG_THREAD_ENABLED_PLATFORM)

        mSetFlagsRule.enableFlags(Flags.FLAG_THREAD_SETTINGS_ENABLED)

        context = spy(ApplicationProvider.getApplicationContext<Context>())

        executor = ContextCompat.getMainExecutor(context)

        fakeThreadNetworkController = FakeThreadNetworkController(executor)
@@ -96,7 +96,7 @@ class ThreadNetworkPreferenceControllerTest { 


    @Test

    fun availabilityStatus_flagDisabled_returnsConditionallyUnavailable() {

        mSetFlagsRule.disableFlags(Flags.FLAG_THREAD_ENABLED_PLATFORM)

        mSetFlagsRule.disableFlags(Flags.FLAG_THREAD_SETTINGS_ENABLED)

        assertThat(controller.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE)

    }