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

Commit 6becd6b1 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents 0b3b19d4 9d52e2bc

packages/SystemUI/res/values/cm_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -124,7 +124,9 @@ 
    <string name="global_action_users">Users</string>



    <!-- Name of the additional status bar icons also exposed with SystemUI Tuner -->

    <string name="status_bar_camera">Camera</string>

    <string name="status_bar_location">Location</string>

    <string name="status_bar_microphone">Microphone</string>



    <!-- Screen pinning dialog description. (for devices without navbar) -->

    <string name="screen_pinning_description_no_navbar">This keeps it in view until you unpin. Touch &amp; hold Back to unpin.</string>

packages/SystemUI/res/xml/status_bar_prefs.xml

+8 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ 
    <!-- tty -->

    <!-- speakerphone -->



    <com.android.systemui.tuner.StatusBarSwitch

        android:key="microphone"

        android:title="@string/status_bar_microphone" />



    <com.android.systemui.tuner.StatusBarSwitch

        android:key="zen"

        android:title="@string/quick_settings_dnd_label" />
@@ -90,6 +94,10 @@ 
        android:key="alarm_clock"

        android:title="@string/status_bar_alarm" />



    <com.android.systemui.tuner.StatusBarSwitch

        android:key="camera"

        android:title="@string/status_bar_camera" />



    <!-- secure -->



    <com.android.systemui.tuner.StatusBarSwitch