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

Commit 0dec0d0a authored by Bill Lin's avatar Bill Lin
Browse files

Fix TalkBack do not announce subTitle for NightDisplayTile 

When focus on the specified Tile, all texts of the Tile should be announced.
(Refer CellularTile The SIM state of subTitle would be announced)

Test: atest SystemUITests
Bug: 80406584
Change-Id: I94a39d422f9e8e3f9339e43b0f6a63e83f3aefbd
parent fa38f941

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

+5 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.metrics.LogMaker; 
import android.provider.Settings;

import android.service.quicksettings.Tile;

import androidx.annotation.StringRes;

import android.text.TextUtils;

import android.util.Log;

import android.widget.Switch;
@@ -101,12 +102,14 @@ public class NightDisplayTile extends QSTileImpl<BooleanState> 
    @Override

    protected void handleUpdateState(BooleanState state, Object arg) {

        state.value = mController.isActivated();

        state.label = state.contentDescription =

                mContext.getString(R.string.quick_settings_night_display_label);

        state.label = mContext.getString(R.string.quick_settings_night_display_label);

        state.icon = ResourceIcon.get(R.drawable.ic_qs_night_display_on);

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

        state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;

        state.secondaryLabel = getSecondaryLabel(state.value);

        state.contentDescription = TextUtils.isEmpty(state.secondaryLabel)

                ? state.label

                : TextUtils.concat(state.label, ", ", state.secondaryLabel);

    }



    /**