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

This commit is contained in:
TreeHugger Robot
2020-03-12 00:25:03 +00:00
committed by Android (Google) Code Review
2 changed files with 8 additions and 2 deletions

View File

@@ -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>

View File

@@ -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>