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

Commit 43b05a8f authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents b7033f04 51613a8e

res/values/arrays.xml

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
        <item>@string/hardware_keys_action_sleep</item>

        <item>@string/hardware_keys_action_last_app</item>

        <item>@string/hardware_keys_action_kill_app</item>

        <item>@string/hardware_keys_action_play_pause_music</item>

    </string-array>



    <string-array name="hardware_keys_action_values" translatable="false">
@@ -95,6 +96,7 @@ 
        <item>7</item>

        <item>8</item>

        <item>10</item>

        <item>11</item>

    </string-array>



    <!-- Volume key cursor control -->

res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ 
    <string name="hardware_keys_action_last_app">Last app</string>

    <string name="hardware_keys_action_split_screen">Split screen</string>

    <string name="hardware_keys_action_kill_app">Kill foreground app</string>

    <string name="hardware_keys_action_play_pause_music" translatable="false">@string/touchscreen_gesture_action_play_pause_music</string>

    <string name="camera_sleep_on_release_title">Screen peek</string>

    <string name="camera_sleep_on_release_summary">A half press will keep the screen on only while the button is held down</string>

    <string name="camera_launch_title">Launch camera</string>