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

Commit 422c953b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add synonym for "Display over other apps""

parents 1c239faf 992b8d00
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -7307,7 +7307,7 @@
    <!-- Search keyword for "Time zone" settings [CHAR_LIMIT=NONE]-->
    <string name="keywords_time_zone">timezone</string>
    <!-- Search keyword for "Display over other apps" settings [CHAR_LIMIT=NONE]-->
    <string name="keywords_draw_overlay">Chat head</string>
    <string name="keywords_draw_overlay">Chat head, system, alert, window, dialog, display, on top other apps, draw</string>
    <!-- Search keyword for "Flashlight" settings [CHAR_LIMIT=NONE]-->
    <string name="keywords_flashlight">Flashlight, Light, Torch</string>
@@ -9388,8 +9388,6 @@
    <!-- Keyword for VR setting -->
    <string name="keywords_vr_listener">vr virtual reality listener stereo helper service</string>
    <!-- Keyword for SYSTEM_ALERT_WINDOW -->
    <string name="keywords_system_alert_window">system alert window dialog display on top other apps</string>
    <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
    <string name="overlay_settings">Display over other apps</string>
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@
        android:key="system_alert_window"
        android:title="@string/system_alert_window_settings"
        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
        settings:keywords="@string/keywords_system_alert_window"
        settings:keywords="@string/keywords_draw_overlay"
        settings:controller="com.android.settings.applications.specialaccess.SystemAlertWindowPreferenceController">
        <extra
            android:name="classname"
+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,6 @@ public class SystemAlertWindowPreferenceController extends BasePreferenceControl
    @Override
    public int getAvailabilityStatus() {
        return isSystemAlertWindowEnabled(mContext)
                ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE ;
                ? AVAILABLE : UNSUPPORTED_ON_DEVICE ;
    }
}