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

Commit bf50c0ba authored by Pierre Barbier de Reuille's avatar Pierre Barbier de Reuille
Browse files

Create new sections for developer options 

To group desktop experience and window management options

Test: Build and check
Bug: 390625230
Flag: EXEMPT (refactor)

Change-Id: Ie076501da68045fa5f1098423a42d32f16a02838
parent ea1cad37

res/xml/development_settings.xml

+35 −27
Original line number Diff line number Diff line
@@ -745,11 +745,42 @@ 
            android:title="@string/force_allow_on_external"

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



        <SwitchPreferenceCompat

            android:key="back_navigation_animation"

            android:title="@string/back_navigation_animation"

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



        <Preference

            android:key="reset_shortcut_manager_throttling"

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



        <SwitchPreferenceCompat

            android:key="disable_phantom_process_monitor"

            android:title="@string/disable_phantom_process_monitor_title"

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



        <SwitchPreferenceCompat

            android:key="force_enable_notes_role"

            android:title="@string/enable_notes_role_title"

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



    </PreferenceCategory>



    <PreferenceCategory

        android:key="window_management_category"

        android:title="@string/window_management_category"

        android:order="1100">



        <SwitchPreferenceCompat

            android:key="force_resizable_activities"

            android:title="@string/force_resizable_activities"

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



        <SwitchPreferenceCompat

            android:key="enable_non_resizable_multi_window"

            android:title="@string/enable_non_resizable_multi_window"

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



        <SwitchPreferenceCompat

            android:key="override_desktop_mode_features"

            android:title="@string/enable_desktop_mode" />
@@ -766,29 +797,6 @@ 
            android:key="force_desktop_mode_on_external_displays"

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



        <SwitchPreferenceCompat

            android:key="enable_non_resizable_multi_window"

            android:title="@string/enable_non_resizable_multi_window"

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



        <SwitchPreferenceCompat

            android:key="back_navigation_animation"

            android:title="@string/back_navigation_animation"

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



        <Preference

            android:key="reset_shortcut_manager_throttling"

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



        <SwitchPreferenceCompat

            android:key="disable_phantom_process_monitor"

            android:title="@string/disable_phantom_process_monitor_title"

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



        <SwitchPreferenceCompat

            android:key="force_enable_notes_role"

            android:title="@string/enable_notes_role_title"

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



    </PreferenceCategory>
@@ -796,7 +804,7 @@ 
        android:key="debug_autofill_category"

        android:title="@string/debug_autofill_category"

        settings:searchable="false"

        android:order="1100"> <!-- Incremented by 100 from last order (i.e. 1000) -->

        android:order="1200"> <!-- Incremented by 100 from last order (i.e. 1000) -->



        <ListPreference

            android:key="autofill_logging_level"
@@ -821,7 +829,7 @@ 
    <PreferenceCategory

        android:key="storage_category"

        android:title="@string/storage_category"

        android:order="1200">

        android:order="1300">



        <Preference

            android:key="shared_data"
@@ -836,7 +844,7 @@ 
    <PreferenceCategory

        android:key="location_category"

        android:title="@string/location_category"

        android:order="1300">

        android:order="1400">



        <Preference android:key="mock_location_app"

                    android:title="@string/mock_location_app" />
@@ -857,7 +865,7 @@ 
    <PreferenceCategory

        android:key="input_method_category"

        android:title="@string/input_method_category"

        android:order="1400">

        android:order="1500">



        <SwitchPreferenceCompat

            android:key="stylus_handwriting"

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -72,10 +72,16 @@ import com.android.settings.development.bluetooth.BluetoothHDAudioPreferenceCont 
import com.android.settings.development.bluetooth.BluetoothQualityDialogPreferenceController;

import com.android.settings.development.bluetooth.BluetoothSampleRateDialogPreferenceController;

import com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController;

import com.android.settings.development.desktopexperience.DesktopExperiencePreferenceController;

import com.android.settings.development.desktopexperience.DesktopModePreferenceController;

import com.android.settings.development.desktopexperience.DesktopModeSecondaryDisplayPreferenceController;

import com.android.settings.development.desktopexperience.FreeformWindowsPreferenceController;

import com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController;

import com.android.settings.development.linuxterminal.LinuxTerminalPreferenceController;

import com.android.settings.development.qstile.DevelopmentTiles;

import com.android.settings.development.storage.SharedDataPreferenceController;

import com.android.settings.development.window.NonResizableMultiWindowPreferenceController;

import com.android.settings.development.window.ResizableActivityPreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.password.ConfirmDeviceCredentialActivity;

import com.android.settings.search.BaseSearchIndexProvider;

src/com/android/settings/development/DesktopExperiencePreferenceController.java→src/com/android/settings/development/desktopexperience/DesktopExperiencePreferenceController.java

+4 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.development;

package com.android.settings.development.desktopexperience;



import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_EXPERIENCE_FEATURES;

import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
@@ -33,6 +33,9 @@ import androidx.preference.TwoStatePreference; 


import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.development.RebootConfirmationDialogFragment;

import com.android.settings.development.RebootConfirmationDialogHost;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;

src/com/android/settings/development/DesktopModePreferenceController.java→src/com/android/settings/development/desktopexperience/DesktopModePreferenceController.java

+4 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.development;

package com.android.settings.development.desktopexperience;



import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;

import static android.window.DesktopModeFlags.ToggleOverride.fromSetting;
@@ -33,6 +33,9 @@ import androidx.preference.TwoStatePreference; 


import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.development.RebootConfirmationDialogFragment;

import com.android.settings.development.RebootConfirmationDialogHost;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;

src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceController.java→src/com/android/settings/development/desktopexperience/DesktopModeSecondaryDisplayPreferenceController.java

+4 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.development;

package com.android.settings.development.desktopexperience;



import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS;
@@ -29,6 +29,9 @@ import androidx.preference.TwoStatePreference; 


import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.development.RebootConfirmationDialogFragment;

import com.android.settings.development.RebootConfirmationDialogHost;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;