PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I856ecc8f4edacd4879e0e72b81460504d5f8548e
This commit is contained in:
Automerger Merge Worker
2020-03-12 00:39:49 +00:00
parent 69a31c2484 cbd5ec24d7
commit 86fac6caee
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/accessibility_magnification_service_settings.xml
View File

@@ -19,12 +19,14 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="magnification_mode_screen" android:key="magnification_mode_screen"
android:persistent="false" android:persistent="false"
android:title="@string/accessibility_magnification_service_settings_title"> android:title="@string/accessibility_magnification_service_settings_title"
settings:searchable="false">
<Preference <Preference
android:key="magnification_mode" android:key="magnification_mode"
android:persistent="false" android:persistent="false"
android:title="@string/accessibility_magnification_mode_title" android:title="@string/accessibility_magnification_mode_title"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.MagnificationModePreferenceController" /> settings:controller="com.android.settings.accessibility.MagnificationModePreferenceController" />
<SwitchPreference <SwitchPreference
@@ -33,6 +35,7 @@
android:title="@string/accessibility_magnification_enable_mode_title" android:title="@string/accessibility_magnification_enable_mode_title"
android:summaryOn="@string/accessibility_magnification_area_settings_full_screen_summary" android:summaryOn="@string/accessibility_magnification_area_settings_full_screen_summary"
android:summaryOff="@string/accessibility_magnification_area_settings_window_screen_summary" android:summaryOff="@string/accessibility_magnification_area_settings_window_screen_summary"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.MagnificationEnablePreferenceController" /> settings:controller="com.android.settings.accessibility.MagnificationEnablePreferenceController" />
</PreferenceScreen> </PreferenceScreen>

5
res/xml/accessibility_magnification_settings.xml
View File

@@ -16,15 +16,18 @@
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" 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 <Preference
android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment" android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
android:key="screen_magnification_gestures_preference_screen" android:key="screen_magnification_gestures_preference_screen"
android:title="@string/accessibility_screen_magnification_gestures_title" android:title="@string/accessibility_screen_magnification_gestures_title"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.MagnificationGesturesPreferenceController"/> settings:controller="com.android.settings.accessibility.MagnificationGesturesPreferenceController"/>
<Preference <Preference
android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment" android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
android:key="screen_magnification_navbar_preference_screen" android:key="screen_magnification_navbar_preference_screen"
android:title="@string/accessibility_screen_magnification_navbar_title" android:title="@string/accessibility_screen_magnification_navbar_title"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.MagnificationNavbarPreferenceController"/> settings:controller="com.android.settings.accessibility.MagnificationNavbarPreferenceController"/>
</PreferenceScreen> </PreferenceScreen>