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

Commit c2bcebb8 authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Fix the accessibility class name of tiles 

In particular, fix internet to Button and add Button to tiles that
didn't have any (and are indeed buttons).

Also, drive by fix to use the correctly threaded method for secondary
click.

Test: manual, tb
Fixes: 378437133
Flag: EXEMPT bugfix
Change-Id: I578049546aa70c759b4ac942a540abe8d208291a
parent 9789ec82

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileNewImplTest.kt

+7 −18
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ class InternetTileNewImplTest : SysuiTestCase() { 
                viewModel,

                dialogManager,

                wifiStateWorker,

                accessPointController

                accessPointController,

            )



        underTest.initialize()
@@ -156,10 +156,7 @@ class InternetTileNewImplTest : SysuiTestCase() { 
        testScope.runTest {

            connectivityRepository.defaultConnections.value = DefaultConnectionModel()

            wifiRepository.wifiScanResults.value =

                listOf(

                    WifiScanEntry(ssid = "ssid 1"),

                    WifiScanEntry(ssid = "ssid 2"),

                )

                listOf(WifiScanEntry(ssid = "ssid 1"), WifiScanEntry(ssid = "ssid 2"))



            runCurrent()

            looper.processAllMessages()
@@ -204,10 +201,7 @@ class InternetTileNewImplTest : SysuiTestCase() { 
        testScope.runTest {

            airplaneModeRepository.setIsAirplaneMode(true)

            connectivityRepository.defaultConnections.value =

                DefaultConnectionModel(

                    wifi = Wifi(true),

                    isValidated = true,

                )

                DefaultConnectionModel(wifi = Wifi(true), isValidated = true)

            wifiRepository.setIsWifiEnabled(true)

            wifiRepository.setWifiNetwork(ACTIVE_WIFI)
@@ -222,10 +216,7 @@ class InternetTileNewImplTest : SysuiTestCase() { 
    fun wifiConnected() =

        testScope.runTest {

            connectivityRepository.defaultConnections.value =

                DefaultConnectionModel(

                    wifi = Wifi(true),

                    isValidated = true,

                )

                DefaultConnectionModel(wifi = Wifi(true), isValidated = true)



            wifiRepository.setIsWifiEnabled(true)

            wifiRepository.setWifiNetwork(ACTIVE_WIFI)
@@ -242,6 +233,7 @@ class InternetTileNewImplTest : SysuiTestCase() { 
        whenever(wifiStateWorker.isWifiEnabled).thenReturn(true)



        underTest.secondaryClick(null)

        looper.processAllMessages()



        verify(wifiStateWorker, times(1)).isWifiEnabled = eq(false)

    }
@@ -251,6 +243,7 @@ class InternetTileNewImplTest : SysuiTestCase() { 
        whenever(wifiStateWorker.isWifiEnabled).thenReturn(false)



        underTest.secondaryClick(null)

        looper.processAllMessages()



        verify(wifiStateWorker, times(1)).isWifiEnabled = eq(true)

    }
@@ -258,10 +251,6 @@ class InternetTileNewImplTest : SysuiTestCase() { 
    companion object {

        const val WIFI_SSID = "test ssid"

        val ACTIVE_WIFI =

            WifiNetworkModel.Active.of(

                isValidated = true,

                level = 4,

                ssid = WIFI_SSID,

            )

            WifiNetworkModel.Active.of(isValidated = true, level = 4, ssid = WIFI_SSID)

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileTest.java

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ public class InternetTileTest extends SysuiTestCase { 
        when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);



        mTile.secondaryClick(null);

        mTestableLooper.processAllMessages();



        verify(mWifiStateWorker, times(1)).setWifiEnabled(eq(false));

    }
@@ -189,6 +190,7 @@ public class InternetTileTest extends SysuiTestCase { 
        when(mWifiStateWorker.isWifiEnabled()).thenReturn(false);



        mTile.secondaryClick(null);

        mTestableLooper.processAllMessages();



        verify(mWifiStateWorker, times(1)).setWifiEnabled(eq(true));

    }

packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt

+5 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import android.provider.AlarmClock 
import android.service.quicksettings.Tile

import android.text.TextUtils

import android.text.format.DateFormat

import android.widget.Button

import androidx.annotation.VisibleForTesting

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.logging.MetricsLogger
@@ -70,7 +71,10 @@ constructor( 
    }



    override fun newTileState(): QSTile.State {

        return QSTile.State().apply { handlesLongClick = false }

        return QSTile.State().apply {

            handlesLongClick = false

            expandedAccessibilityClassName = Button::class.java.name

        }

    }



    override fun handleClick(expandable: Expandable?) {

packages/SystemUI/src/com/android/systemui/qs/tiles/DeviceControlsTile.kt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Intent 
import android.os.Handler

import android.os.Looper

import android.service.quicksettings.Tile

import android.widget.Button

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.logging.MetricsLogger

import com.android.systemui.animation.Expandable
@@ -163,6 +164,7 @@ constructor( 
        } else {

            state.state = Tile.STATE_UNAVAILABLE

        }

        state.expandedAccessibilityClassName = Button::class.java.name

    }



    override fun getMetricsCategory(): Int {

packages/SystemUI/src/com/android/systemui/qs/tiles/DreamTile.java

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.service.dreams.IDreamManager; 
import android.service.quicksettings.Tile;

import android.text.TextUtils;

import android.util.Log;

import android.widget.Switch;



import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;
@@ -176,6 +177,7 @@ public class DreamTile extends QSTileImpl<QSTile.BooleanState> { 
        } else {

            state.state = isDreaming() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;

        }

        state.expandedAccessibilityClassName = Switch.class.getName();

    }



    @Nullable