Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Dev options] Conditionally show Freeform toggle: Only display when freeform is NOT available by default on the device." into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-07-22 20:34:19 +00:00
committed by Android (Google) Code Review
parent 9d47208270 9609216cb5
commit 0dcf3ff102
5 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
res/values/strings.xml
View File

@@ -12240,16 +12240,11 @@
<!-- Default title for the settings panel [CHAR LIMIT=NONE] -->
<string name="settings_panel_title">Settings Panel</string>
<!-- Title for enabling freeform windows (desktop mode) developer option toggle [CHAR LIMIT=50] -->
<string name="enable_desktop_mode">Enable freeform windows</string>
<!-- Summary for enabling freeform windows (desktop mode) developer option toggle [CHAR LIMIT=NONE] -->
<string name="enable_desktop_mode_summary">Enable support for freeform windows.</string>
<!-- Title for a toggle that enables freeform windowing experiences. Freeform windowing experiences are features involving apps running in resizable windows. [CHAR LIMIT=50] -->
<string name="enable_desktop_mode">Enable freeform windowing experiences</string>
<!-- TODO(b/348193756): Rename resources for this toggle to indicate that it is for secondary display -->
<!-- Title for enabling freeform windows (desktop mode) on secondary display developer option toggle [CHAR LIMIT=50] -->
<string name="force_desktop_mode">Enable freeform windowing on second display</string>
<!-- Summary for enabling freeform windows (desktop mode) on secondary display developer option toggle [CHAR LIMIT=NONE] -->
<string name="force_desktop_mode_summary">Enable freeform windows only on secondary display.</string>
<!-- Title for a toggle that enables desktop mode on secondary display. [CHAR LIMIT=50] -->
<string name="enable_desktop_mode_on_secondary_display">Enable desktop mode on secondary display</string>
<!-- UI debug setting: enable non-resizables in multi window [CHAR LIMIT=60] -->
<string name="enable_non_resizable_multi_window">Enable non-resizable in multi window</string>
@@ -13212,14 +13207,12 @@
<!-- The content description for accessibility tools of the customize button. It specifies which screensaver the user is customizing [CHAR LIMIT=NONE] -->
<string name="customize_button_description">Customize <xliff:g id="screensaver_name" example="Art Gallery">%1$s</xliff:g></string>
<!-- Dialog body text used to explain a reboot is required after enabling freeform support for
it to work [CHAR LIMIT=none] -->
<string name="reboot_dialog_enable_freeform_support">A reboot is required to enable legacy freeform windowing support.</string>
<!-- Dialog body text used to explain a reboot is required after overriding freeform windowing (desktop mode) support. [CHAR LIMIT=none] -->
<string name="reboot_dialog_override_desktop_mode">A reboot is required to change freeform windowing support.</string>
<!-- Dialog body text used to explain a reboot is required after forcing freeform windowing (desktop mode) on
secondary displays. [CHAR LIMIT=none] -->
<string name="reboot_dialog_force_desktop_mode">A reboot is required to force freeform windowing on secondary displays.</string>
<!-- Dialog body text used to explain a reboot is required after enabling freeform window support for it to work. Freeform window is when an app runs in a resizable window. [CHAR LIMIT=none] -->
<string name="reboot_dialog_enable_freeform_support">A reboot is required to enable freeform window support.</string>
<!-- Dialog body text used to explain a reboot is required after updating availability of freeform windowing experiences. Freeform windowing experiences are features involving apps running in resizable windows. [CHAR LIMIT=none] -->
<string name="reboot_dialog_override_desktop_mode">A reboot is required to update availability of freeform windowing experiences.</string>
<!-- Dialog body text used to explain a reboot is required after enabling desktop mode on secondary displays. [CHAR LIMIT=none] -->
<string name="reboot_dialog_enable_desktop_mode_on_secondary_display">A reboot is required to enable desktop mode on secondary displays.</string>
<!-- Text on the dialog button to reboot the device now [CHAR LIMIT=50] -->
<string name="reboot_dialog_reboot_now">Reboot now</string>
<!-- Text on the dialog button to reboot the device later [CHAR LIMIT=50] -->

9
res/xml/development_settings.xml
View File

@@ -739,18 +739,15 @@
<SwitchPreferenceCompat
android:key="override_desktop_mode_features"
android:title="@string/enable_desktop_mode"
android:summary="@string/enable_desktop_mode_summary" />
android:title="@string/enable_desktop_mode" />
<SwitchPreferenceCompat
android:key="enable_freeform_support"
android:title="@string/enable_freeform_support"
android:summary="@string/enable_freeform_support_summary" />
android:title="@string/enable_freeform_support" />
<SwitchPreferenceCompat
android:key="force_desktop_mode_on_external_displays"
android:title="@string/force_desktop_mode"
android:summary="@string/force_desktop_mode_summary" />
android:title="@string/enable_desktop_mode_on_secondary_display"/>
<SwitchPreferenceCompat
android:key="enable_non_resizable_multi_window"