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

Commit 61eb0791 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24 

Change-Id: I4094a00c4bf9b04300243a8ff11984e95ac793c1
parents 0cb70101 cbd5ec24

res/xml/accessibility_magnification_service_settings.xml

+4 −1
Original line number Diff line number Diff line
@@ -19,12 +19,14 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="magnification_mode_screen"

    android:persistent="false"

    android:title="@string/accessibility_magnification_service_settings_title">

    android:title="@string/accessibility_magnification_service_settings_title"

    settings:searchable="false">



    <Preference

        android:key="magnification_mode"

        android:persistent="false"

        android:title="@string/accessibility_magnification_mode_title"

        settings:searchable="false"

        settings:controller="com.android.settings.accessibility.MagnificationModePreferenceController" />



    <SwitchPreference
@@ -33,6 +35,7 @@ 
        android:title="@string/accessibility_magnification_enable_mode_title"

        android:summaryOn="@string/accessibility_magnification_area_settings_full_screen_summary"

        android:summaryOff="@string/accessibility_magnification_area_settings_window_screen_summary"

        settings:searchable="false"

        settings:controller="com.android.settings.accessibility.MagnificationEnablePreferenceController" />



</PreferenceScreen>

res/xml/accessibility_magnification_settings.xml

+4 −1
Original line number Diff line number Diff line
@@ -16,15 +16,18 @@ 
<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/accessibility_screen_magnification_title">

    android:title="@string/accessibility_screen_magnification_title"

    settings:searchable="false">

    <Preference

        android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"

        android:key="screen_magnification_gestures_preference_screen"

        android:title="@string/accessibility_screen_magnification_gestures_title"

        settings:searchable="false"

        settings:controller="com.android.settings.accessibility.MagnificationGesturesPreferenceController"/>

    <Preference

        android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"

        android:key="screen_magnification_navbar_preference_screen"

        android:title="@string/accessibility_screen_magnification_navbar_title"

        settings:searchable="false"

        settings:controller="com.android.settings.accessibility.MagnificationNavbarPreferenceController"/>

</PreferenceScreen>