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

Commit 18eecb1e authored by Fan Zhang's avatar Fan Zhang
Browse files

Add config to disable app tray preview in display size. 

Also move some files

Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
parent 8a2c9e79

res/values/bools.xml

+4 −1
Original line number Diff line number Diff line
@@ -174,6 +174,9 @@ 
    <!-- Whether wifi_mac_address should be shown or not. -->

    <bool name="config_show_wifi_mac_address">true</bool>



    <!-- Whether to disable "Uninstall Updates" menu item for System apps or not.. -->

    <!-- Whether to disable "Uninstall Updates" menu item for System apps or not. -->

    <bool name="config_disable_uninstall_update">false</bool>



    <!-- Whether or not extra preview panels should be used for screen zoom setting. -->

    <bool name="config_enable_extra_screen_zoom_preview">true</bool>

</resources>

res/xml/accessibility_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
            android:title="@string/display_category_title">



        <Preference

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

            android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"

            android:key="font_size_preference_screen"

            android:title="@string/title_font_size" />

res/xml/accessibility_settings_for_setup_wizard.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


    <Preference

        android:fragment=

                "com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard"

                "com.android.settings.display.FontSizePreferenceFragmentForSetupWizard"

        android:key="font_size_preference"

        android:title="@string/title_font_size"

        android:summary="@string/short_summary_font_size" />

res/xml/display_settings.xml

+2 −3
Original line number Diff line number Diff line
@@ -80,9 +80,8 @@ 
    <Preference

        android:key="font_size"

        android:title="@string/title_font_size"

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

        settings:controller="com.android.settings.display.FontSizePreferenceController"

        settings:keywords="@string/keywords_display_font_size" />

        android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"

        settings:controller="com.android.settings.display.FontSizePreferenceController" />



    <com.android.settings.display.ScreenZoomPreference

        android:key="display_settings_screen_zoom"

src/com/android/settings/accessibility/AccessibilitySettings.java

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.internal.view.RotationPolicy.RotationPolicyListener; 
import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;

import com.android.settings.display.ToggleFontSizePreferenceFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.RestrictedLockUtils;