Merge 24Q4 (ab/12406339) into aosp-main-future
Bug: 370570306 Merged-In: Ie90e7495dd4a134538bae6e3e08eea0d02134b14 Change-Id: I20517e9ee410e95f2cbeb1247c0c0288ed9f006f
This commit is contained in:
@@ -513,6 +513,11 @@
|
||||
android:title="@string/show_key_presses"
|
||||
android:summary="@string/show_key_presses_summary" />
|
||||
|
||||
<SwitchPreference
|
||||
android:key="touchpad_visualizer"
|
||||
android:title="@string/touchpad_visualizer"
|
||||
android:summary="@string/touchpad_visualizer_summary" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
@@ -728,11 +733,6 @@
|
||||
android:title="@string/inactive_apps_title"
|
||||
android:fragment="com.android.settings.fuelgauge.InactiveApps" />
|
||||
|
||||
<Preference
|
||||
android:key="tare"
|
||||
android:title="@string/tare_title" >
|
||||
</Preference>
|
||||
|
||||
<SwitchPreferenceCompat
|
||||
android:key="force_allow_on_external"
|
||||
android:title="@string/force_allow_on_external"
|
||||
@@ -743,15 +743,17 @@
|
||||
android:title="@string/force_resizable_activities"
|
||||
android:summary="@string/force_resizable_activities_summary" />
|
||||
|
||||
<SwitchPreferenceCompat
|
||||
android:key="override_desktop_mode_features"
|
||||
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"
|
||||
|
||||
Reference in New Issue
Block a user