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

Commit 2f9dd756 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Added secondary label to flashlight 

When flashlight is disabled, specify that it's because the camera is in
use.

Fixes: 138872957
Test: manual

Change-Id: I40836d8a51fca625d2a4391ba6a7315dd9d895eb
parent 10b668e5

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -860,6 +860,8 @@ 
    <string name="quick_settings_notifications_label">Notifications</string>

    <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->

    <string name="quick_settings_flashlight_label">Flashlight</string>

    <!-- QuickSettings: Flashlight, used when it's not available due to camera in use [CHAR LIMIT=NONE] -->

    <string name="quick_settings_flashlight_camera_in_use">Camera in use</string>

    <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->

    <string name="quick_settings_cellular_detail_title">Mobile data</string>

    <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->

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

+5 −1
Original line number Diff line number Diff line
@@ -101,11 +101,15 @@ public class FlashlightTile extends QSTileImpl<BooleanState> implements 
            state.slash = new SlashState();

        }

        state.label = mHost.getContext().getString(R.string.quick_settings_flashlight_label);

        state.secondaryLabel = "";

        if (!mFlashlightController.isAvailable()) {

            state.icon = mIcon;

            state.slash.isSlashed = true;

            state.secondaryLabel = mContext.getString(

                    R.string.quick_settings_flashlight_camera_in_use);

            state.contentDescription = mContext.getString(

                    R.string.accessibility_quick_settings_flashlight_unavailable);

                    R.string.accessibility_quick_settings_flashlight_unavailable)

                    + ", " + state.secondaryLabel;

            state.state = Tile.STATE_UNAVAILABLE;

            return;

        }