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

Snap for 12881634 from fbf2a46140 to 25Q2-release

Browse Source 
Change-Id: I39d92505130832c1818e5542f7ad0e2912b97b04
This commit is contained in:
Android Build Coastguard Worker
2025-01-07 16:18:28 -08:00
parent 75dccf453f fbf2a46140
commit 8d2447a714
66 changed files with 1044 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -140,6 +140,7 @@ android_library {
"android.app.flags-aconfig", "android.app.flags-aconfig",
"android.provider.flags-aconfig", "android.provider.flags-aconfig",
"android.security.flags-aconfig", "android.security.flags-aconfig",
"android.view.contentprotection.flags-aconfig",
"keyboard_flags", "keyboard_flags",
], ],
} }

18
AndroidManifest.xml
View File

@@ -5488,7 +5488,8 @@
android:name="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService" android:name="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService"
android:foregroundServiceType="mediaPlayback" android:foregroundServiceType="mediaPlayback"
android:enabled="true" android:enabled="true"
android:exported="false" /> android:exported="true"
android:permission="android.permission.BLUETOOTH_PRIVILEGED" />
<!-- Once b/364771256 is fixed, add android:featureFlag="com.android.settings.flags.catalyst_service". --> <!-- Once b/364771256 is fixed, add android:featureFlag="com.android.settings.flags.catalyst_service". -->
<!-- Permission is not yet finalized, use READ_BASIC_PHONE_STATE temporarily. --> <!-- Permission is not yet finalized, use READ_BASIC_PHONE_STATE temporarily. -->
@@ -5555,6 +5556,21 @@
android:value="true" /> android:value="true" />
</activity> </activity>
<activity android:name=".Settings$ContentProtectionSettingsActivity"
android:label="@string/content_protection_preference_title"
android:exported="true"
android:featureFlag="android.view.contentprotection.flags.exported_settings_activity_enabled">
<intent-filter>
<action android:name="android.settings.CONTENT_PROTECTION_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.security.ContentProtectionPreferenceFragment"/>
<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
android:value="@string/menu_key_system"/>
</activity>
<!-- This is the longest AndroidManifest.xml ever. --> <!-- This is the longest AndroidManifest.xml ever. -->
</application> </application>
</manifest> </manifest>

5
res/layout/private_space_education_screen.xml
View File

@@ -24,10 +24,6 @@
app:sucHeaderText="@string/private_space_setup_title" app:sucHeaderText="@string/private_space_setup_title"
app:sudDescriptionText="@string/private_space_hide_apps_summary" app:sudDescriptionText="@string/private_space_hide_apps_summary"
android:icon="@drawable/ic_private_space_icon"> android:icon="@drawable/ic_private_space_icon">
<ScrollView
android:id="@+id/main_clear_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:id="@+id/sud_layout_icon_container" android:id="@+id/sud_layout_icon_container"
style="@style/SudContentFrame" style="@style/SudContentFrame"
@@ -124,5 +120,4 @@
android:text="@string/private_space_learn_more_text"/> android:text="@string/private_space_learn_more_text"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</ScrollView>
</com.google.android.setupdesign.GlifLayout> </com.google.android.setupdesign.GlifLayout>

51
res/values/strings.xml
View File

@@ -4672,11 +4672,14 @@
<!-- Summary text for the accessibility setting 'Mouse keys' preference sub-screen. [CHAR LIMIT=100] --> <!-- Summary text for the accessibility setting 'Mouse keys' preference sub-screen. [CHAR LIMIT=100] -->
<string name="mouse_keys_summary">Use your keyboard to control the pointer</string> <string name="mouse_keys_summary">Use your keyboard to control the pointer</string>
<!-- Title for the 'Mouse reverse scrolling' preference switch, which reverses the direction of mouse scroll wheels so that moving the wheel up scrolls the content down. [CHAR LIMIT=60] --> <!-- Title for the 'Mouse reverse scrolling' preference switch, which reverses the direction of mouse scroll wheels so that moving the wheel up scrolls the content down. [CHAR LIMIT=60] -->
<string name="mouse_reverse_vertical_scrolling">Mouse reverse scrolling</string> <string name="mouse_reverse_vertical_scrolling">Reverse scrolling</string>
<!-- Summary text for the 'Mouse reverse scrolling' preference switch indicating to users that when the setting is enabled that scrolling up with their mouse wheel will move the page content down. [CHAR LIMIT=NONE] --> <!-- Summary text for the 'Mouse reverse scrolling' preference switch indicating to users that when the setting is enabled that scrolling up with their mouse wheel will move the page content down. [CHAR LIMIT=NONE] -->
<string name="mouse_reverse_vertical_scrolling_summary">Scroll up to move the page down</string> <string name="mouse_reverse_vertical_scrolling_summary">Content moves up when you scroll down</string>
<!-- TODO(b/383555305): finalize these strings and mark them translatable. -->
<!-- Title for the 'Mouse controlled scrolling' preference switch, which disables the mouse scrolling acceleration so that the scrolling speed becomes directly proportional to the speed at which the wheel is turned. [CHAR LIMIT=60]-->
<string name="mouse_scrolling_acceleration" translatable="false">Controlled scrolling</string>
<!-- Title for the 'Swap buttons' preference switch, which swaps the left and right buttons of connected mice so that right click will be the primary action button and left clicking will be the secondary action, for example showing the context menu. [CHAR LIMIT=60] --> <!-- Title for the 'Swap buttons' preference switch, which swaps the left and right buttons of connected mice so that right click will be the primary action button and left clicking will be the secondary action, for example showing the context menu. [CHAR LIMIT=60] -->
<string name="mouse_swap_primary_button">Swap left and right buttons</string> <string name="mouse_swap_primary_button">Swap primary mouse button</string>
<!-- Summary text for the 'Swap buttons' preference switch indicating to users that when this switch is enabled, their left click will behave as though it is the right click (secondary action) and that the right click will be the primary action. [CHAR LIMIT=NONE] --> <!-- Summary text for the 'Swap buttons' preference switch indicating to users that when this switch is enabled, their left click will behave as though it is the right click (secondary action) and that the right click will be the primary action. [CHAR LIMIT=NONE] -->
<string name="mouse_swap_primary_button_summary">Use the left mouse button as your right</string> <string name="mouse_swap_primary_button_summary">Use the left mouse button as your right</string>
<!-- Title for the 'Cursor acceleration' preference switch, which dynamically adjusts cursor movement based on speed. [CHAR LIMIT=60] --> <!-- Title for the 'Cursor acceleration' preference switch, which dynamically adjusts cursor movement based on speed. [CHAR LIMIT=60] -->
@@ -4723,9 +4726,13 @@
<!-- Title text for 'Tap to click'. [CHAR LIMIT=35] --> <!-- Title text for 'Tap to click'. [CHAR LIMIT=35] -->
<string name="trackpad_tap_to_click">Tap to click</string> <string name="trackpad_tap_to_click">Tap to click</string>
<!-- Title text for 'Tap dragging', a touchpad setting which allows dragging of UI elements by tapping the touchpad with a single finger and then moving it. [CHAR LIMIT=35] --> <!-- Title text for 'Tap dragging', a touchpad setting which allows dragging of UI elements by tapping the touchpad with a single finger and then moving it. [CHAR LIMIT=35] -->
<string name="trackpad_tap_dragging_title">Tap dragging</string> <string name="trackpad_tap_dragging_title">Tap and drag to move items</string>
<!-- Summary text for 'Tap dragging', a touchpad setting which allows dragging of UI elements by tapping the touchpad with a single finger and then moving it. [CHAR LIMIT=60] --> <!-- Summary text for 'Tap dragging', a touchpad setting which allows dragging of UI elements by tapping the touchpad with a single finger and then moving it. [CHAR LIMIT=60] -->
<string name="trackpad_tap_dragging_summary">Tap and drag your finger on the touchpad to move objects</string> <string name="trackpad_tap_dragging_summary">Double-tap an item, hold down on the second tap, and then drag the item to move it</string>
<!-- Title text for 'Touchpad gestures' [CHAR LIMIT=35] -->
<string name="trackpad_touchpad_gesture_title">Touchpad gestures</string>
<!-- Summary text for 'Touchpad gestures' [CHAR LIMIT=60] -->
<string name="trackpad_touchpad_gesture_summary">Customize individual touchpad navigation gestures</string>
<!-- Title text for 'Reverse scrolling' [CHAR LIMIT=35] --> <!-- Title text for 'Reverse scrolling' [CHAR LIMIT=35] -->
<string name="trackpad_reverse_scrolling_title">Reverse scrolling</string> <string name="trackpad_reverse_scrolling_title">Reverse scrolling</string>
<!-- Summary text for 'Reverse scrolling' [CHAR LIMIT=60] --> <!-- Summary text for 'Reverse scrolling' [CHAR LIMIT=60] -->
@@ -4735,9 +4742,9 @@
<!-- Summary text for 'Bottom-right click', a setting that allows the user to right-click by pressing in the bottom-right corner of a touchpad [CHAR LIMIT=60] --> <!-- Summary text for 'Bottom-right click', a setting that allows the user to right-click by pressing in the bottom-right corner of a touchpad [CHAR LIMIT=60] -->
<string name="trackpad_bottom_right_tap_summary">Click in the bottom right corner of the touchpad for more options</string> <string name="trackpad_bottom_right_tap_summary">Click in the bottom right corner of the touchpad for more options</string>
<!-- Title text for 'Pointer speed'. [CHAR LIMIT=35] --> <!-- Title text for 'Pointer speed'. [CHAR LIMIT=35] -->
<string name="trackpad_pointer_speed">Pointer speed</string> <string name="trackpad_pointer_speed">Cursor speed</string>
<!-- Title text for 'Three finger tap' touchpad preference. This preference allows the user to select an action that will trigger when they tap three fingers on a touchpad. [CHAR LIMIT=60] --> <!-- Title text for 'Three finger tap' touchpad preference. This preference allows the user to select an action that will trigger when they tap three fingers on a touchpad. [CHAR LIMIT=60] -->
<string name="three_finger_tap_preference_title">Use three finger tap</string> <string name="three_finger_tap_preference_title">Customise 3-finger tap</string>
<!-- Title text for mouse pointer color. [CHAR LIMIT=35] --> <!-- Title text for mouse pointer color. [CHAR LIMIT=35] -->
<string name="pointer_fill_style">Pointer color</string> <string name="pointer_fill_style">Pointer color</string>
<!-- Content description for black pointer fill style. [CHAR LIMIT=60] --> <!-- Content description for black pointer fill style. [CHAR LIMIT=60] -->
@@ -4873,7 +4880,7 @@
<!-- On Languages & input settings screen, setting summary. Setting for mouse pointer speed. [CHAR LIMIT=35] --> <!-- On Languages & input settings screen, setting summary. Setting for mouse pointer speed. [CHAR LIMIT=35] -->
<string name="pointer_speed">Pointer speed</string> <string name="pointer_speed">Pointer speed</string>
<!-- Setting for mouse pointer scale. [CHAR LIMIT=35] --> <!-- Setting for mouse pointer scale. [CHAR LIMIT=35] -->
<string name="pointer_scale">Pointer scale</string> <string name="pointer_scale">Cursor size</string>
<!-- Content description for decreasing pointer scale. [CHAR LIMIT=35] --> <!-- Content description for decreasing pointer scale. [CHAR LIMIT=35] -->
<string name="pointer_scale_decrease_content_description">Decrease pointer scale</string> <string name="pointer_scale_decrease_content_description">Decrease pointer scale</string>
<!-- Setting for mouse pointer scale. [CHAR LIMIT=35] --> <!-- Setting for mouse pointer scale. [CHAR LIMIT=35] -->
@@ -5024,21 +5031,23 @@
<string name="display_category_title">Display</string> <string name="display_category_title">Display</string>
<!-- Title for the accessibility color and motion page. [CHAR LIMIT=50] --> <!-- Title for the accessibility color and motion page. [CHAR LIMIT=50] -->
<string name="accessibility_color_and_motion_title">Color and motion</string> <string name="accessibility_color_and_motion_title">Color and motion</string>
<!-- Title for the accessibility pointer and touchpad page. [CHAR LIMIT=50] --> <!-- Title for the accessibility cursor and touchpad page. [CHAR LIMIT=50] -->
<string name="accessibility_pointer_and_touchpad_title">Pointer &amp; touchpad accessibility</string> <string name="accessibility_pointer_and_touchpad_title">Cursor &amp; touchpad accessibility</string>
<!-- Summary for the accessibility pointer and touchpad page. [CHAR LIMIT=50] --> <!-- Summary for the accessibility pointer and touchpad page. [CHAR LIMIT=50] -->
<string name="accessibility_pointer_and_touchpad_summary">Pointer color, pointer size &amp; more</string> <string name="accessibility_pointer_and_touchpad_summary">Size, color, type</string>
<!-- Title for the accessibility pointer color customization page. [CHAR LIMIT=50] --> <!-- Title for the accessibility pointer color customization page. [CHAR LIMIT=50] -->
<string name="accessibility_pointer_color_customization_title">Pointer color customization</string> <string name="accessibility_pointer_color_customization_title">Cursor color</string>
<!-- TODO(b/353947750): finalize the four strings below and mark them translatable. --> <!-- TODO(b/353947750): finalize the four strings below and mark them translatable. -->
<!-- Title for the cursor section of the accessibility pointer and touchpad page. -->
<string name="accessibility_pointer_title">Cursor</string>
<!-- Title for the touchpad section of the accessibility pointer and touchpad page. --> <!-- Title for the touchpad section of the accessibility pointer and touchpad page. -->
<string name="accessibility_touchpad_title" translatable="false">Touchpad</string> <string name="accessibility_touchpad_title">Touchpad</string>
<!-- Title for a settings toggle that allows the user to enable or disable system gestures (3- or 4-finger swipes for going home, back, to the overview screen, or between apps) being made on a touchpad. --> <!-- Title for a settings toggle that allows the user to enable or disable system gestures (3- or 4-finger swipes for going home, back, to the overview screen, or between apps) being made on a touchpad. -->
<string name="accessibility_touchpad_system_gestures_enable_title" translatable="false">Use system gestures</string> <string name="accessibility_touchpad_system_gestures_enable_title">Use 3- or 4-finger gestures </string>
<!-- Description text for a settings toggle that allows the user to enable or disable system gestures (3- or 4-finger swipes for going home, back, to the overview screen, or between apps) being made on a touchpad. --> <!-- Description text for a settings toggle that allows the user to enable or disable system gestures (3- or 4-finger swipes for going home, back, to the overview screen, or between apps) being made on a touchpad. -->
<string name="accessibility_touchpad_system_gestures_enable_summary" translatable="false">When turned off, 3- or 4-finger gestures are ignored</string> <string name="accessibility_touchpad_system_gestures_enable_summary">When turned off, your touchpad will ignore 3- or 4-finger gestures</string>
<!-- List of synonyms used in the settings search bar to find the "Use system gestures" touchpad setting, which allows the user to enable or disable system gestures (3- or 4-finger swipes for going home, back, to the overview screen, or between apps) being made on a touchpad. --> <!-- List of synonyms used in the settings search bar to find the "Use system gestures" touchpad setting, which allows the user to enable or disable system gestures (3- or 4-finger swipes for going home, back, to the overview screen, or between apps) being made on a touchpad. -->
<string name="keywords_accessibility_touchpad_system_gestures_enable" translatable="false">touchpad, trackpad, swipe</string> <string name="keywords_accessibility_touchpad_system_gestures_enable">touchpad, trackpad, swipe</string>
<!-- Title for the accessibility color contrast page. [CHAR LIMIT=50] --> <!-- Title for the accessibility color contrast page. [CHAR LIMIT=50] -->
<string name="accessibility_color_contrast_title">Color contrast</string> <string name="accessibility_color_contrast_title">Color contrast</string>
<!-- Intro for the accessibility color contrast page. [CHAR LIMIT=NONE] --> <!-- Intro for the accessibility color contrast page. [CHAR LIMIT=NONE] -->
@@ -5528,7 +5537,7 @@
<!-- suffixed to click action texts "Double-tap to " --> <!-- suffixed to click action texts "Double-tap to " -->
<string name="accessibility_action_label_panel_slice">enter settings</string> <string name="accessibility_action_label_panel_slice">enter settings</string>
<!-- Title for accessibility preference for configuring feature that performs click action soon after mouse/trackpad pointer stops moving. [CHAR LIMIT=NONE] --> <!-- Title for accessibility preference for configuring feature that performs click action soon after mouse/trackpad pointer stops moving. [CHAR LIMIT=NONE] -->
<string name="accessibility_autoclick_preference_title">Autoclick (dwell timing)</string> <string name="accessibility_autoclick_preference_title">Autoclick (Dwell timing)</string>
<!-- Title for accessibility dwell timing footer. [CHAR LIMIT=NONE] --> <!-- Title for accessibility dwell timing footer. [CHAR LIMIT=NONE] -->
<string name="accessibility_autoclick_about_title">About autoclick (dwell timing)</string> <string name="accessibility_autoclick_about_title">About autoclick (dwell timing)</string>
<!-- Accessibility dwell timing footer link content description [CHAR LIMIT=NONE] --> <!-- Accessibility dwell timing footer link content description [CHAR LIMIT=NONE] -->
@@ -5559,6 +5568,12 @@
<string name="accessibility_autoclick_longer_desc">Longer</string> <string name="accessibility_autoclick_longer_desc">Longer</string>
<!-- Description for the seekbar that adjust auto click time. [CHAR_LIMIT=NONE] --> <!-- Description for the seekbar that adjust auto click time. [CHAR_LIMIT=NONE] -->
<string name="accessibility_autoclick_seekbar_desc">Auto click time</string> <string name="accessibility_autoclick_seekbar_desc">Auto click time</string>
<!-- Title for the seekbar that adjust auto click cursor area size. [CHAR_LIMIT=NONE] -->
<!-- TODO(b/383901288): Update string to translatable once approved by UXW. -->
<string name="autoclick_cursor_area_size_title" translatable="false">Cursor area size</string>
<!-- Summary for the seekbar that adjust auto click cursor area size. [CHAR_LIMIT=NONE] -->
<!-- TODO(b/383901288): Update string to translatable once approved by UXW. -->
<string name="autoclick_cursor_area_size_summary" translatable="false">Adjust the autoclick ring indicator area size</string>
<!-- Title for preference screen for configuring vibrations. [CHAR LIMIT=NONE] --> <!-- Title for preference screen for configuring vibrations. [CHAR LIMIT=NONE] -->
<string name="accessibility_vibration_settings_title">Vibration &amp; haptics</string> <string name="accessibility_vibration_settings_title">Vibration &amp; haptics</string>
<!-- Summary for preference screen for configuring vibrations. [CHAR LIMIT=NONE] --> <!-- Summary for preference screen for configuring vibrations. [CHAR LIMIT=NONE] -->
@@ -13343,7 +13358,7 @@
<string name="thread_network_settings_learn_more">Learn more about Thread</string> <string name="thread_network_settings_learn_more">Learn more about Thread</string>
<!-- URL for Thread network settings learn more link [CHAR_LIMIT=NONE] --> <!-- URL for Thread network settings learn more link [CHAR_LIMIT=NONE] -->
<string name="thread_network_settings_learn_more_link" translatable="false">https://developers.home.google.com</string> <string name="thread_network_settings_learn_more_link" translatable="false">https://support.google.com/android?p=thread_toggle</string>
<!-- Label for the camera use toggle [CHAR LIMIT=40] --> <!-- Label for the camera use toggle [CHAR LIMIT=40] -->
<string name="camera_toggle_title">Camera access</string> <string name="camera_toggle_title">Camera access</string>

9
res/xml/accessibility_autoclick_settings.xml
View File

@@ -76,6 +76,15 @@
settings:searchable="false" settings:searchable="false"
settings:controller="com.android.settings.accessibility.ToggleAutoclickCustomSeekbarController"/> settings:controller="com.android.settings.accessibility.ToggleAutoclickCustomSeekbarController"/>
<com.android.settingslib.widget.SliderPreference
android:key="accessibility_control_autoclick_cursor_area_size"
android:title="@string/autoclick_cursor_area_size_title"
android:summary="@string/autoclick_cursor_area_size_summary"
settings:seekBarIncrement="20"
android:selectable="false"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.ToggleAutoclickCursorAreaSizeController"/>
<com.android.settings.accessibility.AccessibilityFooterPreference <com.android.settings.accessibility.AccessibilityFooterPreference
android:key="accessibility_autoclick_footer" android:key="accessibility_autoclick_footer"
android:title="@string/accessibility_autoclick_description" android:title="@string/accessibility_autoclick_description"

61
res/xml/accessibility_pointer_and_touchpad.xml
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!-- Copyright 2024 The Android Open Source Project
<!-- Copyright 2024 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@@ -14,37 +13,43 @@
limitations under the License. limitations under the License.
--> -->
<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:key="accessibility_pointer_and_touchpad" android:key="accessibility_pointer_and_touchpad"
android:persistent="false" android:persistent="false"
android:title="@string/accessibility_pointer_and_touchpad_title"> android:title="@string/accessibility_pointer_and_touchpad_title">
<com.android.settings.widget.LabeledSeekBarPreference <PreferenceCategory
android:key="pointer_scale_preference" android:key="pointer_category"
android:title="@string/pointer_scale"
android:max="@integer/pointer_scale_seek_bar_end"
settings:iconStart="@drawable/ic_remove_24dp"
settings:iconStartContentDescription="@string/pointer_scale_decrease_content_description"
settings:iconEnd="@drawable/ic_add_24dp"
settings:iconEndContentDescription="@string/pointer_scale_increase_content_description"
settings:keywords="@string/pointer_scale_keywords"
settings:controller="com.android.settings.inputmethod.PointerScaleSeekBarController" />
<Preference
android:fragment="com.android.settings.inputmethod.PointerColorCustomizationFragment"
android:key="pointer_color_customization_preference"
android:persistent="false" android:persistent="false"
android:title="@string/accessibility_pointer_color_customization_title"/> android:title="@string/accessibility_pointer_title">
<Preference <com.android.settings.widget.LabeledSeekBarPreference
android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment" android:key="pointer_scale_preference"
android:key="autoclick_preference" android:max="@integer/pointer_scale_seek_bar_end"
android:persistent="false" android:title="@string/pointer_scale"
android:title="@string/accessibility_autoclick_preference_title" settings:controller="com.android.settings.inputmethod.PointerScaleSeekBarController"
settings:keywords="@string/keywords_auto_click" settings:iconEnd="@drawable/ic_add_24dp"
settings:controller="com.android.settings.accessibility.AutoclickPreferenceController"/> settings:iconEndContentDescription="@string/pointer_scale_increase_content_description"
settings:iconStart="@drawable/ic_remove_24dp"
settings:iconStartContentDescription="@string/pointer_scale_decrease_content_description"
settings:keywords="@string/pointer_scale_keywords" />
<Preference
android:fragment="com.android.settings.inputmethod.PointerColorCustomizationFragment"
android:key="pointer_color_customization_preference"
android:persistent="false"
android:title="@string/accessibility_pointer_color_customization_title" />
<Preference
android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
android:key="autoclick_preference"
android:persistent="false"
android:title="@string/accessibility_autoclick_preference_title"
settings:controller="com.android.settings.accessibility.AutoclickPreferenceController"
settings:keywords="@string/keywords_auto_click" />
</PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="touchpad_category" android:key="touchpad_category"
@@ -53,9 +58,9 @@
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="touchpad_system_gestures_enable" android:key="touchpad_system_gestures_enable"
android:title="@string/accessibility_touchpad_system_gestures_enable_title"
android:summary="@string/accessibility_touchpad_system_gestures_enable_summary" android:summary="@string/accessibility_touchpad_system_gestures_enable_summary"
settings:keywords="@string/keywords_accessibility_touchpad_system_gestures_enable"/> android:title="@string/accessibility_touchpad_system_gestures_enable_title"
settings:keywords="@string/keywords_accessibility_touchpad_system_gestures_enable" />
</PreferenceCategory> </PreferenceCategory>

51
res/xml/app_language_picker.xml Normal file
View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2024 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/app_locale_picker_title"
android:key="key_app_language_picker_page">
<com.android.settingslib.widget.TopIntroPreference
android:key="app_locale_disclaimer"
android:title="@string/desc_app_locale_disclaimer"
settings:isPreferenceVisible="false"
android:order="1"/>
<com.android.settingslib.widget.IntroPreference
android:key="app_intro"
android:order="2"/>
<com.android.settingslib.widget.TopIntroPreference
android:key="app_locale_description"
android:title="@string/desc_no_available_supported_locale"
android:order="3"
android:selectable="false"
settings:isPreferenceVisible="false"
settings:searchable="false"/>
<PreferenceCategory
android:key="app_language_suggested_category"
android:title="@string/suggested_locales_title"
android:order="4"/>
<PreferenceCategory
android:key="app_language_all_supported_category"
android:title="@string/all_supported_locales_title"
android:order="5"/>
</PreferenceScreen>

27
res/xml/mouse_settings.xml
View File

@@ -20,6 +20,12 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/mouse_settings"> android:title="@string/mouse_settings">
<SwitchPreferenceCompat
android:key="mouse_swap_primary_button"
android:title="@string/mouse_swap_primary_button"
android:summary="@string/mouse_swap_primary_button_summary"
settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="mouse_reverse_vertical_scrolling" android:key="mouse_reverse_vertical_scrolling"
android:title="@string/mouse_reverse_vertical_scrolling" android:title="@string/mouse_reverse_vertical_scrolling"
@@ -37,4 +43,25 @@
android:title="@string/mouse_pointer_acceleration" android:title="@string/mouse_pointer_acceleration"
android:summary="@string/mouse_pointer_acceleration_summary" android:summary="@string/mouse_pointer_acceleration_summary"
settings:controller="com.android.settings.inputmethod.MousePointerAccelerationPreferenceController" /> settings:controller="com.android.settings.inputmethod.MousePointerAccelerationPreferenceController" />
<SwitchPreferenceCompat
android:key="mouse_scrolling_acceleration"
android:title="@string/mouse_scrolling_acceleration"
settings:controller="com.android.settings.inputmethod.MouseScrollingAccelerationPreferenceController" />
<com.android.settings.widget.SeekBarPreference
android:key="trackpad_pointer_speed"
android:title="@string/trackpad_pointer_speed"
android:order="40"
android:selectable="false"
settings:controller="com.android.settings.inputmethod.TrackpadPointerSpeedPreferenceController"/>
<Preference
android:fragment="com.android.settings.inputmethod.PointerTouchpadFragment"
android:key="accessibility_pointer_and_touchpad"
android:order="50"
android:persistent="false"
android:title="@string/accessibility_pointer_and_touchpad_title"
android:summary="@string/accessibility_pointer_and_touchpad_summary"
settings:searchable="true"/>
</PreferenceScreen> </PreferenceScreen>

6
res/xml/touchpad_and_mouse_settings.xml
View File

@@ -75,6 +75,12 @@
settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController" settings:controller="com.android.settings.inputmethod.MouseSwapPrimaryButtonPreferenceController"
android:order="47"/> android:order="47"/>
<SwitchPreferenceCompat
android:key="mouse_scrolling_acceleration"
android:title="@string/mouse_scrolling_acceleration"
settings:controller="com.android.settings.inputmethod.MouseScrollingAccelerationPreferenceController"
android:order="48"/>
<Preference <Preference
android:fragment="com.android.settings.inputmethod.PointerTouchpadFragment" android:fragment="com.android.settings.inputmethod.PointerTouchpadFragment"
android:key="pointer_and_touchpad" android:key="pointer_and_touchpad"

13
res/xml/touchpad_settings.xml
View File

@@ -47,6 +47,13 @@
settings:controller="com.android.settings.inputmethod.TrackpadTapDraggingPreferenceController" settings:controller="com.android.settings.inputmethod.TrackpadTapDraggingPreferenceController"
android:order="35"/> android:order="35"/>
<Preference
android:fragment="com.android.settings.inputmethod.TouchpadThreeFingerTapFragment"
android:key="three_finger_tap"
android:title="@string/three_finger_tap_preference_title"
settings:controller="com.android.settings.inputmethod.TouchpadThreeFingerTapPreferenceController"
android:order="37"/>
<com.android.settings.widget.SeekBarPreference <com.android.settings.widget.SeekBarPreference
android:key="trackpad_pointer_speed" android:key="trackpad_pointer_speed"
android:title="@string/trackpad_pointer_speed" android:title="@string/trackpad_pointer_speed"
@@ -67,4 +74,10 @@
android:key="trackpad_touch_gesture" android:key="trackpad_touch_gesture"
android:title="@string/trackpad_touch_gesture" android:title="@string/trackpad_touch_gesture"
settings:controller="com.android.settings.inputmethod.TouchGesturesButtonPreferenceController"/> settings:controller="com.android.settings.inputmethod.TouchGesturesButtonPreferenceController"/>
<com.android.settingslib.widget.FooterPreference
android:key="trackpad_gestures_disabled_footer"
android:title="@string/trackpad_gestures_disabled_footer_text"
settings:searchable="false"
settings:controller="com.android.settings.inputmethod.TrackpadGesturesDisabledFooterPreferenceController"/>
</PreferenceScreen> </PreferenceScreen>

1
src/com/android/settings/Settings.java
View File

@@ -528,4 +528,5 @@ public class Settings extends SettingsActivity {
public static class HearingDevicesActivity extends SettingsActivity { /* empty */ } public static class HearingDevicesActivity extends SettingsActivity { /* empty */ }
public static class HearingDevicesPairingActivity extends SettingsActivity { /* empty */ } public static class HearingDevicesPairingActivity extends SettingsActivity { /* empty */ }
public static class ContactsStorageSettingsActivity extends SettingsActivity { /* empty */ } public static class ContactsStorageSettingsActivity extends SettingsActivity { /* empty */ }
public static class ContentProtectionSettingsActivity extends SettingsActivity { /* empty */ }
} }

103
src/com/android/settings/accessibility/ToggleAutoclickCursorAreaSizeController.java Normal file
View File

@@ -0,0 +1,103 @@
/*
* Copyright 2025 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.accessibility;
import static android.content.Context.MODE_PRIVATE;
import android.content.Context;
import android.content.SharedPreferences;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
import com.android.server.accessibility.Flags;
import com.android.settings.core.SliderPreferenceController;
/** Controller class that controls accessibility autoclick cursor area size settings. */
public class ToggleAutoclickCursorAreaSizeController extends SliderPreferenceController
implements LifecycleObserver, SharedPreferences.OnSharedPreferenceChangeListener {
public static final String TAG = ToggleAutoclickCursorAreaSizeController.class.getSimpleName();
private static final int MIN_SIZE = 20;
private static final int MAX_SIZE = 100;
private static final int DEFAULT_SIZE = 60;
private final SharedPreferences mSharedPreferences;
public ToggleAutoclickCursorAreaSizeController(@NonNull Context context,
@NonNull String preferenceKey) {
super(context, preferenceKey);
mSharedPreferences = context.getSharedPreferences(context.getPackageName(), MODE_PRIVATE);
}
@OnLifecycleEvent(Lifecycle.Event.ON_START)
public void onStart() {
if (mSharedPreferences != null) {
mSharedPreferences.registerOnSharedPreferenceChangeListener(this);
}
}
@OnLifecycleEvent(Lifecycle.Event.ON_STOP)
public void onStop() {
if (mSharedPreferences != null) {
mSharedPreferences.unregisterOnSharedPreferenceChangeListener(this);
}
}
@Override
public void displayPreference(@NonNull PreferenceScreen screen) {
super.displayPreference(screen);
}
@Override
public int getAvailabilityStatus() {
return Flags.enableAutoclickIndicator() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
public void onSharedPreferenceChanged(
@NonNull SharedPreferences sharedPreferences, @Nullable String key) {
// TODO(b/383901288): Update slider.
}
@Override
public boolean setSliderPosition(int position) {
// TODO(b/383901288): Update settings.
return true;
}
@Override
public int getSliderPosition() {
// TODO(b/383901288): retrieve from settings and fallback to default.
return DEFAULT_SIZE;
}
@Override
public int getMax() {
return MAX_SIZE;
}
@Override
public int getMin() {
return MIN_SIZE;
}
}

4
src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
View File

@@ -331,7 +331,9 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
MAIN_DEVICE_ID); MAIN_DEVICE_ID);
} }
}); });
if (Flags.enableBluetoothDeviceDetailsPolish()) { boolean isTempBond = com.android.settingslib.flags.Flags.enableTemporaryBondDevicesUi()
&& BluetoothUtils.isTemporaryBondDevice(mCachedDevice.getDevice());
if (Flags.enableBluetoothDeviceDetailsPolish() && !isTempBond) {
ImageButton renameButton = mLayoutPreference.findViewById(R.id.rename_button); ImageButton renameButton = mLayoutPreference.findViewById(R.id.rename_button);
renameButton.setVisibility(View.VISIBLE); renameButton.setVisibility(View.VISIBLE);
renameButton.setOnClickListener(view -> { renameButton.setOnClickListener(view -> {

22
src/com/android/settings/bluetooth/GeneralBluetoothDetailsHeaderController.java
View File

@@ -89,15 +89,19 @@ public class GeneralBluetoothDetailsHeaderController extends BluetoothDetailsCon
if (summary != null) { if (summary != null) {
summary.setText(mCachedDevice.getConnectionSummary()); summary.setText(mCachedDevice.getConnectionSummary());
} }
ImageButton renameButton = mLayoutPreference.findViewById(R.id.rename_button); boolean isTempBond = com.android.settingslib.flags.Flags.enableTemporaryBondDevicesUi()
renameButton.setVisibility(View.VISIBLE); && BluetoothUtils.isTemporaryBondDevice(mCachedDevice.getDevice());
renameButton.setOnClickListener( if (!isTempBond) {
view -> { ImageButton renameButton = mLayoutPreference.findViewById(R.id.rename_button);
RemoteDeviceNameDialogFragment.newInstance(mCachedDevice) renameButton.setVisibility(View.VISIBLE);
.show( renameButton.setOnClickListener(
mFragment.getFragmentManager(), view -> {
RemoteDeviceNameDialogFragment.TAG); RemoteDeviceNameDialogFragment.newInstance(mCachedDevice)
}); .show(
mFragment.getFragmentManager(),
RemoteDeviceNameDialogFragment.TAG);
});
}
} }
@Override @Override

4
src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java
View File

@@ -168,7 +168,9 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr
if (mLayoutPreference == null || mCachedDevice == null) { if (mLayoutPreference == null || mCachedDevice == null) {
return; return;
} }
if (Flags.enableBluetoothDeviceDetailsPolish()) { boolean isTempBond = com.android.settingslib.flags.Flags.enableTemporaryBondDevicesUi()
&& BluetoothUtils.isTemporaryBondDevice(mCachedDevice.getDevice());
if (Flags.enableBluetoothDeviceDetailsPolish() && !isTempBond) {
ImageButton renameButton = mLayoutPreference.findViewById(R.id.rename_button); ImageButton renameButton = mLayoutPreference.findViewById(R.id.rename_button);
renameButton.setVisibility(View.VISIBLE); renameButton.setVisibility(View.VISIBLE);
renameButton.setOnClickListener(view -> { renameButton.setOnClickListener(view -> {

4
src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaService.java
View File

@@ -77,7 +77,7 @@ public class AudioStreamMediaService extends Service {
private static final int ZERO_PLAYBACK_SPEED = 0; private static final int ZERO_PLAYBACK_SPEED = 0;
private final PlaybackState.Builder mPlayStatePlayingBuilder = private final PlaybackState.Builder mPlayStatePlayingBuilder =
new PlaybackState.Builder() new PlaybackState.Builder()
.setActions(PlaybackState.ACTION_PAUSE | PlaybackState.ACTION_SEEK_TO) .setActions(PlaybackState.ACTION_PLAY_PAUSE | PlaybackState.ACTION_SEEK_TO)
.setState( .setState(
PlaybackState.STATE_PLAYING, PlaybackState.STATE_PLAYING,
STATIC_PLAYBACK_POSITION, STATIC_PLAYBACK_POSITION,
@@ -88,7 +88,7 @@ public class AudioStreamMediaService extends Service {
com.android.settings.R.drawable.ic_clear); com.android.settings.R.drawable.ic_clear);
private final PlaybackState.Builder mPlayStatePausingBuilder = private final PlaybackState.Builder mPlayStatePausingBuilder =
new PlaybackState.Builder() new PlaybackState.Builder()
.setActions(PlaybackState.ACTION_PLAY | PlaybackState.ACTION_SEEK_TO) .setActions(PlaybackState.ACTION_PLAY_PAUSE | PlaybackState.ACTION_SEEK_TO)
.setState( .setState(
PlaybackState.STATE_PAUSED, PlaybackState.STATE_PAUSED,
STATIC_PLAYBACK_POSITION, STATIC_PLAYBACK_POSITION,

4
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -189,6 +189,7 @@ import com.android.settings.regionalpreferences.RegionPickerFragment;
import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment; import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment;
import com.android.settings.regionalpreferences.TemperatureUnitFragment; import com.android.settings.regionalpreferences.TemperatureUnitFragment;
import com.android.settings.safetycenter.MoreSecurityPrivacyFragment; import com.android.settings.safetycenter.MoreSecurityPrivacyFragment;
import com.android.settings.security.ContentProtectionPreferenceFragment;
import com.android.settings.security.LockscreenDashboardFragment; import com.android.settings.security.LockscreenDashboardFragment;
import com.android.settings.security.MemtagPage; import com.android.settings.security.MemtagPage;
import com.android.settings.security.SecurityAdvancedSettings; import com.android.settings.security.SecurityAdvancedSettings;
@@ -415,7 +416,8 @@ public class SettingsGateway {
HearingDevicePairingFragment.class.getName(), HearingDevicePairingFragment.class.getName(),
ZenModesListFragment.class.getName(), ZenModesListFragment.class.getName(),
ZenModeFragment.class.getName(), ZenModeFragment.class.getName(),
ContactsStorageSettings.class.getName() ContactsStorageSettings.class.getName(),
ContentProtectionPreferenceFragment.class.getName(),
}; };
public static final String[] SETTINGS_FOR_RESTRICTED = { public static final String[] SETTINGS_FOR_RESTRICTED = {

3
src/com/android/settings/datausage/AppDataUsagePreference.java
View File

@@ -21,6 +21,7 @@ import android.widget.ProgressBar;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.datausage.lib.DataUsageFormatter;
import com.android.settingslib.AppItem; import com.android.settingslib.AppItem;
import com.android.settingslib.net.UidDetail; import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider; import com.android.settingslib.net.UidDetailProvider;
@@ -46,7 +47,7 @@ public class AppDataUsagePreference extends AppPreference {
if (item.restricted && item.total <= 0) { if (item.restricted && item.total <= 0) {
setSummary(com.android.settings.R.string.data_usage_app_restricted); setSummary(com.android.settings.R.string.data_usage_app_restricted);
} else { } else {
setSummary(DataUsageUtils.formatDataUsage(context, item.total)); setSummary(new DataUsageFormatter(context).formatDataUsage(item.total));
} }
mDetail = provider.getUidDetail(item.key, false /* blocking */); mDetail = provider.getUidDetail(item.key, false /* blocking */);
if (mDetail != null) { if (mDetail != null) {

12
src/com/android/settings/datausage/AppDataUsageSummaryController.kt
View File

@@ -37,8 +37,7 @@ class AppDataUsageSummaryController(context: Context, preferenceKey: String) :
private val dataFlow = MutableStateFlow(NetworkUsageDetailsData.AllZero) private val dataFlow = MutableStateFlow(NetworkUsageDetailsData.AllZero)
private val dataUsageFormatter = DataUsageFormatter(context) private val dataUsageFormatter = DataUsageFormatter(context)
private val emptyDataUsage = private val emptyDataUsage = context.getPlaceholder()
DataUsageFormatter.FormattedDataUsage(context.getPlaceholder(), context.getPlaceholder())
private val totalUsageFlow = dataFlow.map { private val totalUsageFlow = dataFlow.map {
dataUsageFormatter.formatDataUsage(it.totalUsage) dataUsageFormatter.formatDataUsage(it.totalUsage)
@@ -66,18 +65,15 @@ class AppDataUsageSummaryController(context: Context, preferenceKey: String) :
val backgroundUsage by backgroundUsageFlow.collectAsStateWithLifecycle(emptyDataUsage) val backgroundUsage by backgroundUsageFlow.collectAsStateWithLifecycle(emptyDataUsage)
Preference(object : PreferenceModel { Preference(object : PreferenceModel {
override val title = stringResource(R.string.total_size_label) override val title = stringResource(R.string.total_size_label)
override val summary = { totalUsage.displayText } override val summary = { totalUsage }
override val summaryContentDescription = { totalUsage.contentDescription }
}) })
Preference(object : PreferenceModel { Preference(object : PreferenceModel {
override val title = stringResource(R.string.data_usage_label_foreground) override val title = stringResource(R.string.data_usage_label_foreground)
override val summary = { foregroundUsage.displayText } override val summary = { foregroundUsage }
override val summaryContentDescription = { foregroundUsage.contentDescription }
}) })
Preference(object : PreferenceModel { Preference(object : PreferenceModel {
override val title = stringResource(R.string.data_usage_label_background) override val title = stringResource(R.string.data_usage_label_background)
override val summary = { backgroundUsage.displayText } override val summary = { backgroundUsage }
override val summaryContentDescription = { backgroundUsage.contentDescription }
}) })
} }
} }

5
src/com/android/settings/datausage/BillingCycleSettings.java
View File

@@ -152,8 +152,9 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
void updatePrefs() { void updatePrefs() {
mBillingCycle.setSummary(null); mBillingCycle.setSummary(null);
final long warningBytes = services.mPolicyEditor.getPolicyWarningBytes(mNetworkTemplate); final long warningBytes = services.mPolicyEditor.getPolicyWarningBytes(mNetworkTemplate);
DataUsageFormatter dataUsageFormatter = new DataUsageFormatter(requireContext());
if (warningBytes != WARNING_DISABLED) { if (warningBytes != WARNING_DISABLED) {
mDataWarning.setSummary(DataUsageUtils.formatDataUsage(getContext(), warningBytes)); mDataWarning.setSummary(dataUsageFormatter.formatDataUsage(warningBytes));
mDataWarning.setEnabled(true); mDataWarning.setEnabled(true);
mEnableDataWarning.setChecked(true); mEnableDataWarning.setChecked(true);
} else { } else {
@@ -163,7 +164,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
} }
final long limitBytes = services.mPolicyEditor.getPolicyLimitBytes(mNetworkTemplate); final long limitBytes = services.mPolicyEditor.getPolicyLimitBytes(mNetworkTemplate);
if (limitBytes != LIMIT_DISABLED) { if (limitBytes != LIMIT_DISABLED) {
mDataLimit.setSummary(DataUsageUtils.formatDataUsage(getContext(), limitBytes)); mDataLimit.setSummary(dataUsageFormatter.formatDataUsage(limitBytes));
mDataLimit.setEnabled(true); mDataLimit.setEnabled(true);
mEnableDataLimit.setChecked(true); mEnableDataLimit.setChecked(true);
} else { } else {

9
src/com/android/settings/datausage/ChartDataUsagePreference.java
View File

@@ -20,7 +20,6 @@ import android.net.NetworkPolicy;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.text.format.Formatter;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.DataUnit; import android.util.DataUnit;
@@ -34,9 +33,11 @@ import androidx.preference.PreferenceViewHolder;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.datausage.lib.DataUsageFormatter;
import com.android.settings.datausage.lib.NetworkCycleChartData; import com.android.settings.datausage.lib.NetworkCycleChartData;
import com.android.settings.datausage.lib.NetworkUsageData; import com.android.settings.datausage.lib.NetworkUsageData;
import com.android.settings.widget.UsageView; import com.android.settings.widget.UsageView;
import com.android.settingslib.spaprivileged.framework.common.BytesFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
@@ -279,10 +280,10 @@ public class ChartDataUsagePreference extends Preference {
} }
private CharSequence getLabel(long bytes, int str, int mLimitColor) { private CharSequence getLabel(long bytes, int str, int mLimitColor) {
Formatter.BytesResult result = Formatter.formatBytes(mResources, bytes, DataUsageFormatter dataUsageFormatter = new DataUsageFormatter(getContext());
Formatter.FLAG_SHORTER | Formatter.FLAG_IEC_UNITS); BytesFormatter.Result result = dataUsageFormatter.formatDataUsageWithUnits(bytes);
CharSequence label = TextUtils.expandTemplate(getContext().getText(str), CharSequence label = TextUtils.expandTemplate(getContext().getText(str),
result.value, result.units); result.getNumber(), result.getUnits());
return new SpannableStringBuilder().append(label, new ForegroundColorSpan(mLimitColor), 0); return new SpannableStringBuilder().append(label, new ForegroundColorSpan(mLimitColor), 0);
} }

2
src/com/android/settings/datausage/DataUsageList.kt
View File

@@ -172,7 +172,7 @@ open class DataUsageList : DashboardFragment() {
private fun updateSelectedCycle(usageData: NetworkUsageData) { private fun updateSelectedCycle(usageData: NetworkUsageData) {
Log.d(TAG, "showing cycle $usageData") Log.d(TAG, "showing cycle $usageData")
usageAmount?.title = usageData.getDataUsedString(requireContext()).displayText usageAmount?.title = usageData.getDataUsedString(requireContext())
viewModel.selectedCycleFlow.value = usageData viewModel.selectedCycleFlow.value = usageData
updateApps(usageData) updateApps(usageData)

4
src/com/android/settings/datausage/DataUsagePreference.java
View File

@@ -28,6 +28,7 @@ import androidx.preference.Preference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settings.datausage.lib.DataUsageFormatter;
import com.android.settingslib.net.DataUsageController; import com.android.settingslib.net.DataUsageController;
public class DataUsagePreference extends Preference implements TemplatePreference { public class DataUsagePreference extends Preference implements TemplatePreference {
@@ -58,8 +59,9 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
final DataUsageController.DataUsageInfo usageInfo = final DataUsageController.DataUsageInfo usageInfo =
controller.getDataUsageInfo(mTemplate); controller.getDataUsageInfo(mTemplate);
setTitle(mTitleRes); setTitle(mTitleRes);
DataUsageFormatter dataUsageFormatter = new DataUsageFormatter(getContext());
setSummary(getContext().getString(R.string.data_usage_template, setSummary(getContext().getString(R.string.data_usage_template,
DataUsageUtils.formatDataUsage(getContext(), usageInfo.usageLevel), dataUsageFormatter.formatDataUsage(usageInfo.usageLevel),
usageInfo.period)); usageInfo.period));
} }
final long usageLevel = controller.getHistoricalUsageLevel(template); final long usageLevel = controller.getHistoricalUsageLevel(template);

33
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -22,12 +22,7 @@ import android.os.Bundle;
import android.os.UserManager; import android.os.UserManager;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.text.BidiFormatter;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.Formatter;
import android.text.style.RelativeSizeSpan;
import android.util.EventLog; import android.util.EventLog;
import android.util.Log; import android.util.Log;
@@ -211,34 +206,6 @@ public class DataUsageSummary extends DashboardFragment {
updateState(); updateState();
} }
@VisibleForTesting
static CharSequence formatUsage(Context context, String template, long usageLevel) {
final float LARGER_SIZE = 1.25f * 1.25f; // (1/0.8)^2
final float SMALLER_SIZE = 1.0f / LARGER_SIZE; // 0.8^2
return formatUsage(context, template, usageLevel, LARGER_SIZE, SMALLER_SIZE);
}
static CharSequence formatUsage(Context context, String template, long usageLevel,
float larger, float smaller) {
final int FLAGS = Spannable.SPAN_INCLUSIVE_INCLUSIVE;
final Formatter.BytesResult usedResult = Formatter.formatBytes(context.getResources(),
usageLevel, Formatter.FLAG_CALCULATE_ROUNDED | Formatter.FLAG_IEC_UNITS);
final SpannableString enlargedValue = new SpannableString(usedResult.value);
enlargedValue.setSpan(new RelativeSizeSpan(larger), 0, enlargedValue.length(), FLAGS);
final SpannableString amountTemplate = new SpannableString(
context.getString(com.android.internal.R.string.fileSizeSuffix)
.replace("%1$s", "^1").replace("%2$s", "^2"));
final CharSequence formattedUsage = TextUtils.expandTemplate(amountTemplate,
enlargedValue, usedResult.units);
final SpannableString fullTemplate = new SpannableString(template);
fullTemplate.setSpan(new RelativeSizeSpan(smaller), 0, fullTemplate.length(), FLAGS);
return TextUtils.expandTemplate(fullTemplate,
BidiFormatter.getInstance().unicodeWrap(formattedUsage.toString()));
}
private void updateState() { private void updateState() {
PreferenceScreen screen = getPreferenceScreen(); PreferenceScreen screen = getPreferenceScreen();
for (int i = 1; i < screen.getPreferenceCount(); i++) { for (int i = 1; i < screen.getPreferenceCount(); i++) {

18
src/com/android/settings/datausage/DataUsageSummaryPreference.java
View File

@@ -24,7 +24,6 @@ import android.telephony.SubscriptionPlan;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.Formatter;
import android.text.style.AbsoluteSizeSpan; import android.text.style.AbsoluteSizeSpan;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
@@ -39,7 +38,9 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.datausage.lib.DataUsageFormatter;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.settingslib.spaprivileged.framework.common.BytesFormatter;
import com.android.settingslib.utils.StringUtil; import com.android.settingslib.utils.StringUtil;
import java.util.HashMap; import java.util.HashMap;
@@ -165,11 +166,12 @@ public class DataUsageSummaryPreference extends Preference {
} }
private void updateDataUsageLabels(PreferenceViewHolder holder) { private void updateDataUsageLabels(PreferenceViewHolder holder) {
TextView usageNumberField = getDataUsed(holder); DataUsageFormatter dataUsageFormatter = new DataUsageFormatter(getContext());
final Formatter.BytesResult usedResult = Formatter.formatBytes(getContext().getResources(), TextView usageNumberField = getDataUsed(holder);
mDataplanUse, Formatter.FLAG_CALCULATE_ROUNDED | Formatter.FLAG_IEC_UNITS); final BytesFormatter.Result usedResult =
final SpannableString usageNumberText = new SpannableString(usedResult.value); dataUsageFormatter.formatDataUsageWithUnits(mDataplanUse);
final SpannableString usageNumberText = new SpannableString(usedResult.getNumber());
final int textSize = final int textSize =
getContext().getResources().getDimensionPixelSize(R.dimen.usage_number_text_size); getContext().getResources().getDimensionPixelSize(R.dimen.usage_number_text_size);
usageNumberText.setSpan(new AbsoluteSizeSpan(textSize), 0, usageNumberText.length(), usageNumberText.setSpan(new AbsoluteSizeSpan(textSize), 0, usageNumberText.length(),
@@ -177,7 +179,7 @@ public class DataUsageSummaryPreference extends Preference {
CharSequence template = getContext().getText(R.string.data_used_formatted); CharSequence template = getContext().getText(R.string.data_used_formatted);
CharSequence usageText = CharSequence usageText =
TextUtils.expandTemplate(template, usageNumberText, usedResult.units); TextUtils.expandTemplate(template, usageNumberText, usedResult.getUnits());
usageNumberField.setText(usageText); usageNumberField.setText(usageText);
final MeasurableLinearLayout layout = getLayout(holder); final MeasurableLinearLayout layout = getLayout(holder);
@@ -188,13 +190,13 @@ public class DataUsageSummaryPreference extends Preference {
if (dataRemaining >= 0) { if (dataRemaining >= 0) {
usageRemainingField.setText( usageRemainingField.setText(
TextUtils.expandTemplate(getContext().getText(R.string.data_remaining), TextUtils.expandTemplate(getContext().getText(R.string.data_remaining),
DataUsageUtils.formatDataUsage(getContext(), dataRemaining))); dataUsageFormatter.formatDataUsage(dataRemaining)));
usageRemainingField.setTextColor( usageRemainingField.setTextColor(
Utils.getColorAttr(getContext(), android.R.attr.colorAccent)); Utils.getColorAttr(getContext(), android.R.attr.colorAccent));
} else { } else {
usageRemainingField.setText( usageRemainingField.setText(
TextUtils.expandTemplate(getContext().getText(R.string.data_overusage), TextUtils.expandTemplate(getContext().getText(R.string.data_overusage),
DataUsageUtils.formatDataUsage(getContext(), -dataRemaining))); dataUsageFormatter.formatDataUsage(-dataRemaining)));
usageRemainingField.setTextColor( usageRemainingField.setTextColor(
Utils.getColorAttr(getContext(), android.R.attr.colorError)); Utils.getColorAttr(getContext(), android.R.attr.colorError));
} }

15
src/com/android/settings/datausage/DataUsageSummaryPreferenceController.kt
View File

@@ -24,6 +24,7 @@ import android.util.Log
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import androidx.preference.PreferenceScreen import androidx.preference.PreferenceScreen
import com.android.settings.R import com.android.settings.R
import com.android.settings.datausage.lib.DataUsageFormatter
import com.android.settings.datausage.lib.DataUsageLib.getMobileTemplate import com.android.settings.datausage.lib.DataUsageLib.getMobileTemplate
import com.android.settings.datausage.lib.INetworkCycleDataRepository import com.android.settings.datausage.lib.INetworkCycleDataRepository
import com.android.settings.datausage.lib.NetworkCycleDataRepository import com.android.settings.datausage.lib.NetworkCycleDataRepository
@@ -72,6 +73,8 @@ open class DataUsageSummaryPreferenceController @JvmOverloads constructor(
private lateinit var preference: DataUsageSummaryPreference private lateinit var preference: DataUsageSummaryPreference
private val dataUsageFormatter = DataUsageFormatter(mContext)
override fun getAvailabilityStatus(subId: Int) = override fun getAvailabilityStatus(subId: Int) =
if (subInfo != null) AVAILABLE else CONDITIONALLY_UNAVAILABLE if (subInfo != null) AVAILABLE else CONDITIONALLY_UNAVAILABLE
@@ -120,8 +123,8 @@ open class DataUsageSummaryPreferenceController @JvmOverloads constructor(
private fun setDataBarSize(dataBarSize: Long) { private fun setDataBarSize(dataBarSize: Long) {
preference.setLabels( preference.setLabels(
DataUsageUtils.formatDataUsage(mContext, /* byteValue = */ 0), dataUsageFormatter.formatDataUsage(/* byteValue = */ 0),
DataUsageUtils.formatDataUsage(mContext, dataBarSize) dataUsageFormatter.formatDataUsage(dataBarSize)
) )
} }
@@ -129,22 +132,22 @@ open class DataUsageSummaryPreferenceController @JvmOverloads constructor(
warningBytes > 0 && limitBytes > 0 -> { warningBytes > 0 && limitBytes > 0 -> {
TextUtils.expandTemplate( TextUtils.expandTemplate(
mContext.getText(R.string.cell_data_warning_and_limit), mContext.getText(R.string.cell_data_warning_and_limit),
DataUsageUtils.formatDataUsage(mContext, warningBytes), dataUsageFormatter.formatDataUsage(warningBytes),
DataUsageUtils.formatDataUsage(mContext, limitBytes), dataUsageFormatter.formatDataUsage(limitBytes),
) )
} }
warningBytes > 0 -> { warningBytes > 0 -> {
TextUtils.expandTemplate( TextUtils.expandTemplate(
mContext.getText(R.string.cell_data_warning), mContext.getText(R.string.cell_data_warning),
DataUsageUtils.formatDataUsage(mContext, warningBytes), dataUsageFormatter.formatDataUsage(warningBytes),
) )
} }
limitBytes > 0 -> { limitBytes > 0 -> {
TextUtils.expandTemplate( TextUtils.expandTemplate(
mContext.getText(R.string.cell_data_limit), mContext.getText(R.string.cell_data_limit),
DataUsageUtils.formatDataUsage(mContext, limitBytes), dataUsageFormatter.formatDataUsage(limitBytes),
) )
} }

16
src/com/android/settings/datausage/DataUsageUtils.java
View File

@@ -31,9 +31,6 @@ import android.provider.Settings;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.BidiFormatter;
import android.text.format.Formatter;
import android.text.format.Formatter.BytesResult;
import android.util.Log; import android.util.Log;
import com.android.settings.datausage.lib.DataUsageLib; import com.android.settings.datausage.lib.DataUsageLib;
@@ -54,19 +51,6 @@ public final class DataUsageUtils {
private DataUsageUtils() { private DataUsageUtils() {
} }
/**
* Format byte value to readable string using IEC units.
*
* @deprecated Use {@link com.android.settings.datausage.lib.DataUsageFormatter} instead.
*/
@Deprecated
public static CharSequence formatDataUsage(Context context, long byteValue) {
final BytesResult res = Formatter.formatBytes(context.getResources(), byteValue,
Formatter.FLAG_IEC_UNITS);
return BidiFormatter.getInstance().unicodeWrap(context.getString(
com.android.internal.R.string.fileSizeSuffix, res.value, res.units));
}
/** /**
* Test if device has an ethernet network connection. * Test if device has an ethernet network connection.
*/ */

38
src/com/android/settings/datausage/lib/DataUsageFormatter.kt
View File

@@ -16,40 +16,20 @@
package com.android.settings.datausage.lib package com.android.settings.datausage.lib
import android.annotation.StringRes
import android.content.Context import android.content.Context
import android.content.res.Resources import android.content.res.Resources
import android.icu.text.UnicodeSet import com.android.settingslib.spaprivileged.framework.common.BytesFormatter
import android.icu.text.UnicodeSetSpanner
import android.text.BidiFormatter
import android.text.format.Formatter
import com.android.internal.R
class DataUsageFormatter(private val context: Context) { class DataUsageFormatter(context: Context) {
data class FormattedDataUsage( private val bytesFormatter = BytesFormatter(context)
val displayText: String,
val contentDescription: String,
) {
fun format(context: Context, @StringRes resId: Int, vararg formatArgs: Any?) =
FormattedDataUsage(
displayText = context.getString(resId, displayText, *formatArgs),
contentDescription = context.getString(resId, contentDescription, *formatArgs),
)
}
/** Formats the data usage. */ /** Formats the data usage. */
fun formatDataUsage(sizeBytes: Long): FormattedDataUsage { fun formatDataUsage(sizeBytes: Long): String =
val result = Formatter.formatBytes(context.resources, sizeBytes, Formatter.FLAG_IEC_UNITS) bytesFormatter.format(sizeBytes, BytesFormatter.UseCase.DataUsage)
return FormattedDataUsage(
displayText = BidiFormatter.getInstance().unicodeWrap( fun formatDataUsageWithUnits(sizeBytes: Long): BytesFormatter.Result =
context.getString(R.string.fileSizeSuffix, result.value, result.units) bytesFormatter.formatWithUnits(sizeBytes, BytesFormatter.UseCase.DataUsage)
),
contentDescription = context.getString(
R.string.fileSizeSuffix, result.value, result.unitsContentDescription
),
)
}
companion object { companion object {
/** /**
@@ -59,6 +39,6 @@ class DataUsageFormatter(private val context: Context) {
* in Settings, and align with other places in Settings. * in Settings, and align with other places in Settings.
*/ */
fun Resources.getBytesDisplayUnit(bytes: Long): String = fun Resources.getBytesDisplayUnit(bytes: Long): String =
Formatter.formatBytes(this, bytes, Formatter.FLAG_IEC_UNITS).units BytesFormatter(this).formatWithUnits(bytes, BytesFormatter.UseCase.DataUsage).units
} }
} }

7
src/com/android/settings/datausage/lib/NetworkUsageData.kt
View File

@@ -20,7 +20,6 @@ import android.content.Context
import android.text.format.DateUtils import android.text.format.DateUtils
import android.util.Range import android.util.Range
import com.android.settings.R import com.android.settings.R
import com.android.settings.datausage.lib.DataUsageFormatter.FormattedDataUsage
/** /**
* Base data structure representing usage data in a period. * Base data structure representing usage data in a period.
@@ -38,11 +37,11 @@ data class NetworkUsageData(
fun formatDateRange(context: Context): String = fun formatDateRange(context: Context): String =
DateUtils.formatDateRange(context, startTime, endTime, DATE_FORMAT) DateUtils.formatDateRange(context, startTime, endTime, DATE_FORMAT)
fun formatUsage(context: Context): FormattedDataUsage = fun formatUsage(context: Context): String =
DataUsageFormatter(context).formatDataUsage(usage) DataUsageFormatter(context).formatDataUsage(usage)
fun getDataUsedString(context: Context): FormattedDataUsage = fun getDataUsedString(context: Context): String =
formatUsage(context).format(context, R.string.data_used_template) context.getString(R.string.data_used_template, formatUsage(context))
companion object { companion object {
val AllZero = NetworkUsageData( val AllZero = NetworkUsageData(

94
src/com/android/settings/development/BackAnimationPreferenceController.java
View File

@@ -1,94 +0,0 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.development;
import static com.android.window.flags.Flags.predictiveBackSystemAnims;
import android.content.Context;
import android.provider.Settings;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
/**
* PreferenceController for enabling/disabling animation related to back button and back gestures.
*/
public class BackAnimationPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String BACK_NAVIGATION_ANIMATION_KEY =
"back_navigation_animation";
private static final int SETTING_VALUE_OFF = 0;
private static final int SETTING_VALUE_ON = 1;
@Nullable private final DevelopmentSettingsDashboardFragment mFragment;
@VisibleForTesting
BackAnimationPreferenceController(Context context) {
super(context);
mFragment = null;
}
public BackAnimationPreferenceController(Context context,
@Nullable DevelopmentSettingsDashboardFragment fragment) {
super(context);
mFragment = fragment;
}
@Override
public boolean isAvailable() {
return !predictiveBackSystemAnims();
}
@Override
public String getPreferenceKey() {
return BACK_NAVIGATION_ANIMATION_KEY;
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean isEnabled = (Boolean) newValue;
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ENABLE_BACK_ANIMATION,
isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
if (mFragment != null && isEnabled) {
BackAnimationPreferenceDialog.show(mFragment);
}
return true;
}
@Override
public void updateState(Preference preference) {
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ENABLE_BACK_ANIMATION, SETTING_VALUE_OFF);
((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ENABLE_BACK_ANIMATION, SETTING_VALUE_OFF);
((TwoStatePreference) mPreference).setChecked(false);
}
}

1
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -832,7 +832,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new OverlaySettingsPreferenceController(context)); controllers.add(new OverlaySettingsPreferenceController(context));
controllers.add(new StylusHandwritingPreferenceController(context)); controllers.add(new StylusHandwritingPreferenceController(context));
controllers.add(new IngressRateLimitPreferenceController((context))); controllers.add(new IngressRateLimitPreferenceController((context)));
controllers.add(new BackAnimationPreferenceController(context, fragment));
controllers.add(new PhantomProcessPreferenceController(context)); controllers.add(new PhantomProcessPreferenceController(context));
controllers.add(new ForceEnableNotesRolePreferenceController(context)); controllers.add(new ForceEnableNotesRolePreferenceController(context));
controllers.add(new GrammaticalGenderPreferenceController(context)); controllers.add(new GrammaticalGenderPreferenceController(context));

3
src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceController.java
View File

@@ -65,7 +65,8 @@ public class DoubleTapPowerForCameraPreferenceController extends BasePreferenceC
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (!DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext)) { if (!DoubleTapPowerSettingsUtils
.isMultiTargetDoubleTapPowerButtonGestureAvailable(mContext)) {
return UNSUPPORTED_ON_DEVICE; return UNSUPPORTED_ON_DEVICE;
} }
return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext) return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext)

3
src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceController.java
View File

@@ -65,7 +65,8 @@ public class DoubleTapPowerForWalletPreferenceController extends BasePreferenceC
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (!DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext)) { if (!DoubleTapPowerSettingsUtils
.isMultiTargetDoubleTapPowerButtonGestureAvailable(mContext)) {
return UNSUPPORTED_ON_DEVICE; return UNSUPPORTED_ON_DEVICE;
} }
return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext) return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureEnabled(mContext)

3
src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceController.java
View File

@@ -57,7 +57,8 @@ public class DoubleTapPowerMainSwitchPreferenceController
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext) return DoubleTapPowerSettingsUtils
.isMultiTargetDoubleTapPowerButtonGestureAvailable(mContext)
? AVAILABLE ? AVAILABLE
: UNSUPPORTED_ON_DEVICE; : UNSUPPORTED_ON_DEVICE;
} }

26
src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.gestures;
import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED; import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_DISABLED_MODE;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.provider.Settings; import android.provider.Settings;
@@ -37,7 +39,8 @@ public class DoubleTapPowerPreferenceController extends BasePreferenceController
public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) { public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
return !isGestureAvailable(context) return !isGestureAvailable(context)
|| prefs.getBoolean(DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, false); || prefs.getBoolean(DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE,
false);
} }
private static boolean isGestureAvailable(@NonNull Context context) { private static boolean isGestureAvailable(@NonNull Context context) {
@@ -46,7 +49,10 @@ public class DoubleTapPowerPreferenceController extends BasePreferenceController
.getBoolean( .getBoolean(
com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled); com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
} }
return DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(context); return context.getResources()
.getInteger(
com.android.internal.R.integer.config_doubleTapPowerGestureMode)
!= DOUBLE_TAP_POWER_DISABLED_MODE;
} }
@Override @Override
@@ -56,7 +62,9 @@ public class DoubleTapPowerPreferenceController extends BasePreferenceController
@Override @Override
public void displayPreference(@NonNull PreferenceScreen screen) { public void displayPreference(@NonNull PreferenceScreen screen) {
if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()) { if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()
|| !DoubleTapPowerSettingsUtils
.isMultiTargetDoubleTapPowerButtonGestureAvailable(mContext)) {
final Preference preference = screen.findPreference(getPreferenceKey()); final Preference preference = screen.findPreference(getPreferenceKey());
if (preference != null) { if (preference != null) {
preference.setTitle(R.string.double_tap_power_for_camera_title); preference.setTitle(R.string.double_tap_power_for_camera_title);
@@ -68,12 +76,14 @@ public class DoubleTapPowerPreferenceController extends BasePreferenceController
@Override @Override
@NonNull @NonNull
public CharSequence getSummary() { public CharSequence getSummary() {
if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()) { if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()
|| !DoubleTapPowerSettingsUtils
.isMultiTargetDoubleTapPowerButtonGestureAvailable(mContext)) {
final boolean isCameraDoubleTapPowerGestureEnabled = final boolean isCameraDoubleTapPowerGestureEnabled =
Settings.Secure.getInt( Settings.Secure.getInt(
mContext.getContentResolver(), mContext.getContentResolver(),
CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
DoubleTapPowerToOpenCameraPreferenceController.ON) DoubleTapPowerToOpenCameraPreferenceController.ON)
== DoubleTapPowerToOpenCameraPreferenceController.ON; == DoubleTapPowerToOpenCameraPreferenceController.ON;
return mContext.getText( return mContext.getText(
isCameraDoubleTapPowerGestureEnabled isCameraDoubleTapPowerGestureEnabled
@@ -85,7 +95,7 @@ public class DoubleTapPowerPreferenceController extends BasePreferenceController
mContext.getText(com.android.settings.R.string.gesture_setting_on); mContext.getText(com.android.settings.R.string.gesture_setting_on);
final CharSequence actionString = final CharSequence actionString =
DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureForCameraLaunchEnabled( DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureForCameraLaunchEnabled(
mContext) mContext)
? mContext.getText(R.string.double_tap_power_camera_action_summary) ? mContext.getText(R.string.double_tap_power_camera_action_summary)
: mContext.getText(R.string.double_tap_power_wallet_action_summary); : mContext.getText(R.string.double_tap_power_wallet_action_summary);
return mContext.getString(R.string.double_tap_power_summary, onString, actionString); return mContext.getString(R.string.double_tap_power_summary, onString, actionString);

18
src/com/android/settings/gestures/DoubleTapPowerSettings.java
View File

@@ -39,9 +39,11 @@ public class DoubleTapPowerSettings extends DashboardFragment {
public static final String PREF_KEY_SUGGESTION_COMPLETE = public static final String PREF_KEY_SUGGESTION_COMPLETE =
"pref_double_tap_power_suggestion_complete"; "pref_double_tap_power_suggestion_complete";
private Context mContext;
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
mContext = context;
super.onAttach(context); super.onAttach(context);
SuggestionFeatureProvider suggestionFeatureProvider = SuggestionFeatureProvider suggestionFeatureProvider =
FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider(); FeatureFactory.getFeatureFactory().getSuggestionFeatureProvider();
@@ -61,7 +63,15 @@ public class DoubleTapPowerSettings extends DashboardFragment {
@Override @Override
protected int getPreferenceScreenResId() { protected int getPreferenceScreenResId() {
return android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap() return getDoubleTapPowerSettingsResId(mContext);
}
private static int getDoubleTapPowerSettingsResId(Context context) {
if (!android.service.quickaccesswallet.Flags.launchWalletOptionOnPowerDoubleTap()) {
return R.xml.double_tap_power_to_open_camera_settings;
}
return DoubleTapPowerSettingsUtils
.isMultiTargetDoubleTapPowerButtonGestureAvailable(context)
? R.xml.double_tap_power_settings ? R.xml.double_tap_power_settings
: R.xml.double_tap_power_to_open_camera_settings; : R.xml.double_tap_power_to_open_camera_settings;
} }
@@ -73,11 +83,7 @@ public class DoubleTapPowerSettings extends DashboardFragment {
public List<SearchIndexableResource> getXmlResourcesToIndex( public List<SearchIndexableResource> getXmlResourcesToIndex(
@NonNull Context context, boolean enabled) { @NonNull Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context); final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = sir.xmlResId = getDoubleTapPowerSettingsResId(context);
android.service.quickaccesswallet.Flags
.launchWalletOptionOnPowerDoubleTap()
? R.xml.double_tap_power_settings
: R.xml.double_tap_power_to_open_camera_settings;
return List.of(sir); return List.of(sir);
} }
}; };

40
src/com/android/settings/gestures/DoubleTapPowerSettingsUtils.java
View File

@@ -29,6 +29,16 @@ import com.android.internal.R;
/** Common code for double tap power settings shared between controllers. */ /** Common code for double tap power settings shared between controllers. */
final class DoubleTapPowerSettingsUtils { final class DoubleTapPowerSettingsUtils {
/** Configuration value indicating double tap power button gesture is disabled. */
static final int DOUBLE_TAP_POWER_DISABLED_MODE = 0;
/** Configuration value indicating double tap power button gesture should launch camera. */
static final int DOUBLE_TAP_POWER_LAUNCH_CAMERA_MODE = 1;
/**
* Configuration value indicating double tap power button gesture should launch one of many
* target actions.
*/
static final int DOUBLE_TAP_POWER_MULTI_TARGET_MODE = 2;
/** Setting storing whether the double tap power button gesture is enabled. */ /** Setting storing whether the double tap power button gesture is enabled. */
private static final String DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED = private static final String DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED =
Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED; Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED;
@@ -52,19 +62,23 @@ final class DoubleTapPowerSettingsUtils {
/** /**
* @return true if double tap power button gesture is available. * @return true if double tap power button gesture is available.
*/ */
public static boolean isDoubleTapPowerButtonGestureAvailable(@NonNull Context context) { public static boolean isMultiTargetDoubleTapPowerButtonGestureAvailable(
return context.getResources().getBoolean(R.bool.config_doubleTapPowerGestureEnabled); @NonNull Context context) {
return context.getResources()
.getInteger(
R.integer.config_doubleTapPowerGestureMode)
== DOUBLE_TAP_POWER_MULTI_TARGET_MODE;
} }
/** /**
* Gets double tap power button gesture enable or disable flag from Settings provider. * Gets double tap power button gesture enable or disable flag from Settings provider.
* *
* @return true if double tap on the power button gesture is currently enabled.
* @param context App context * @param context App context
* @return true if double tap on the power button gesture is currently enabled.
*/ */
public static boolean isDoubleTapPowerButtonGestureEnabled(@NonNull Context context) { public static boolean isDoubleTapPowerButtonGestureEnabled(@NonNull Context context) {
return Settings.Secure.getInt( return Settings.Secure.getInt(
context.getContentResolver(), DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, ON) context.getContentResolver(), DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, ON)
== ON; == ON;
} }
@@ -72,7 +86,7 @@ final class DoubleTapPowerSettingsUtils {
* Sets double tap power button gesture enable or disable flag to Settings provider. * Sets double tap power button gesture enable or disable flag to Settings provider.
* *
* @param context App context * @param context App context
* @param enable enable or disable double tap power button gesture. * @param enable enable or disable double tap power button gesture.
* @return {@code true} if the setting is updated. * @return {@code true} if the setting is updated.
*/ */
public static boolean setDoubleTapPowerButtonGestureEnabled( public static boolean setDoubleTapPowerButtonGestureEnabled(
@@ -84,19 +98,19 @@ final class DoubleTapPowerSettingsUtils {
} }
/** /**
* @return true if double tap on the power button gesture for camera launch is currently
* enabled.
* @param context App context * @param context App context
* @return true if double tap on the power button gesture for camera launch is currently
* enabled.
*/ */
public static boolean isDoubleTapPowerButtonGestureForCameraLaunchEnabled( public static boolean isDoubleTapPowerButtonGestureForCameraLaunchEnabled(
@NonNull Context context) { @NonNull Context context) {
return Settings.Secure.getInt( return Settings.Secure.getInt(
context.getContentResolver(), context.getContentResolver(),
DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION, DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION,
context.getResources() context.getResources()
.getInteger( .getInteger(
com.android.internal.R.integer com.android.internal.R.integer
.config_defaultDoubleTapPowerGestureAction)) .config_doubleTapPowerGestureMultiTargetDefaultAction))
== DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE; == DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE;
} }

8
src/com/android/settings/inputmethod/InputSettingPreferenceController.java
View File

@@ -40,6 +40,8 @@ import androidx.preference.Preference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settings.keyboard.Flags; import com.android.settings.keyboard.Flags;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -51,6 +53,7 @@ public abstract class InputSettingPreferenceController extends TogglePreferenceC
private static final int CUSTOM_PROGRESS_INTERVAL = 100; private static final int CUSTOM_PROGRESS_INTERVAL = 100;
private static final long MILLISECOND_IN_SECONDS = TimeUnit.SECONDS.toMillis(1); private static final long MILLISECOND_IN_SECONDS = TimeUnit.SECONDS.toMillis(1);
private final ContentResolver mContentResolver; private final ContentResolver mContentResolver;
protected final MetricsFeatureProvider mMetricsFeatureProvider;
private final ContentObserver mContentObserver = new ContentObserver(new Handler(true)) { private final ContentObserver mContentObserver = new ContentObserver(new Handler(true)) {
@Override @Override
public void onChange(boolean selfChange, Uri uri) { public void onChange(boolean selfChange, Uri uri) {
@@ -72,10 +75,14 @@ public abstract class InputSettingPreferenceController extends TogglePreferenceC
return 0; return 0;
} }
protected void onCustomValueUpdated(int thresholdTimeMillis) {
}
public InputSettingPreferenceController(@NonNull Context context, public InputSettingPreferenceController(@NonNull Context context,
@NonNull String preferenceKey) { @NonNull String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
} }
@Override @Override
@@ -150,6 +157,7 @@ public abstract class InputSettingPreferenceController extends TogglePreferenceC
} }
} }
updateInputSettingKeysValue(threshold); updateInputSettingKeysValue(threshold);
onCustomValueUpdated(threshold);
}) })
.setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss()) .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
.create(); .create();

12
src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
View File

@@ -16,6 +16,10 @@
package com.android.settings.inputmethod; package com.android.settings.inputmethod;
import static android.app.settings.SettingsEnums.ACTION_BOUNCE_KEYS_CUSTOM_VALUE_CHANGE;
import static android.app.settings.SettingsEnums.ACTION_BOUNCE_KEYS_DISABLED;
import static android.app.settings.SettingsEnums.ACTION_BOUNCE_KEYS_ENABLED;
import android.content.Context; import android.content.Context;
import android.hardware.input.InputSettings; import android.hardware.input.InputSettings;
import android.net.Uri; import android.net.Uri;
@@ -78,9 +82,17 @@ public class KeyboardAccessibilityBounceKeysController extends
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
updateInputSettingKeysValue(isChecked ? BOUNCE_KEYS_THRESHOLD : 0); updateInputSettingKeysValue(isChecked ? BOUNCE_KEYS_THRESHOLD : 0);
mMetricsFeatureProvider.action(mContext,
isChecked ? ACTION_BOUNCE_KEYS_ENABLED : ACTION_BOUNCE_KEYS_DISABLED);
return true; return true;
} }
@Override
protected void onCustomValueUpdated(int thresholdTimeMillis) {
mMetricsFeatureProvider.action(mContext, ACTION_BOUNCE_KEYS_CUSTOM_VALUE_CHANGE,
thresholdTimeMillis);
}
@Override @Override
protected void onInputSettingUpdated() { protected void onInputSettingUpdated() {
if (mPrimaryPreference != null) { if (mPrimaryPreference != null) {

5
src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.inputmethod; package com.android.settings.inputmethod;
import static android.app.settings.SettingsEnums.ACTION_MOUSE_KEYS_DISABLED;
import static android.app.settings.SettingsEnums.ACTION_MOUSE_KEYS_ENABLED;
import android.content.Context; import android.content.Context;
import android.hardware.input.InputSettings; import android.hardware.input.InputSettings;
import android.net.Uri; import android.net.Uri;
@@ -63,6 +66,8 @@ public class KeyboardAccessibilityMouseKeysController extends
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
InputSettings.setAccessibilityMouseKeysEnabled(mContext, InputSettings.setAccessibilityMouseKeysEnabled(mContext,
isChecked); isChecked);
mMetricsFeatureProvider.action(mContext,
isChecked ? ACTION_MOUSE_KEYS_ENABLED : ACTION_MOUSE_KEYS_DISABLED);
return true; return true;
} }

12
src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
View File

@@ -16,6 +16,10 @@
package com.android.settings.inputmethod; package com.android.settings.inputmethod;
import static android.app.settings.SettingsEnums.ACTION_SLOW_KEYS_CUSTOM_VALUE_CHANGE;
import static android.app.settings.SettingsEnums.ACTION_SLOW_KEYS_DISABLED;
import static android.app.settings.SettingsEnums.ACTION_SLOW_KEYS_ENABLED;
import android.content.Context; import android.content.Context;
import android.hardware.input.InputSettings; import android.hardware.input.InputSettings;
import android.net.Uri; import android.net.Uri;
@@ -58,6 +62,8 @@ public class KeyboardAccessibilitySlowKeysController extends
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
updateInputSettingKeysValue(isChecked ? SLOW_KEYS_THRESHOLD : 0); updateInputSettingKeysValue(isChecked ? SLOW_KEYS_THRESHOLD : 0);
mMetricsFeatureProvider.action(mContext,
isChecked ? ACTION_SLOW_KEYS_ENABLED : ACTION_SLOW_KEYS_DISABLED);
return true; return true;
} }
@@ -98,6 +104,12 @@ public class KeyboardAccessibilitySlowKeysController extends
InputSettings.setAccessibilitySlowKeysThreshold(mContext, thresholdTimeMillis); InputSettings.setAccessibilitySlowKeysThreshold(mContext, thresholdTimeMillis);
} }
@Override
protected void onCustomValueUpdated(int thresholdTimeMillis) {
mMetricsFeatureProvider.action(mContext,
ACTION_SLOW_KEYS_CUSTOM_VALUE_CHANGE, thresholdTimeMillis);
}
@Override @Override
protected int getInputSettingKeysValue() { protected int getInputSettingKeysValue() {
return InputSettings.getAccessibilitySlowKeysThreshold(mContext); return InputSettings.getAccessibilitySlowKeysThreshold(mContext);

5
src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysController.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.inputmethod; package com.android.settings.inputmethod;
import static android.app.settings.SettingsEnums.ACTION_STICKY_KEYS_DISABLED;
import static android.app.settings.SettingsEnums.ACTION_STICKY_KEYS_ENABLED;
import android.content.Context; import android.content.Context;
import android.hardware.input.InputSettings; import android.hardware.input.InputSettings;
import android.net.Uri; import android.net.Uri;
@@ -52,6 +55,8 @@ public class KeyboardAccessibilityStickyKeysController extends
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
InputSettings.setAccessibilityStickyKeysEnabled(mContext, InputSettings.setAccessibilityStickyKeysEnabled(mContext,
isChecked); isChecked);
mMetricsFeatureProvider.action(mContext,
isChecked ? ACTION_STICKY_KEYS_ENABLED : ACTION_STICKY_KEYS_DISABLED);
return true; return true;
} }

2
src/com/android/settings/inputmethod/KeyboardRepeatKeysMainFragment.java
View File

@@ -68,7 +68,7 @@ public class KeyboardRepeatKeysMainFragment extends DashboardFragment
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.PHYSICAL_KEYBOARD_A11Y; return SettingsEnums.PHYSICAL_KEYBOARD_REPEAT_KEYS;
} }
@Override @Override

2
src/com/android/settings/inputmethod/MouseKeysMainPageFragment.java
View File

@@ -83,7 +83,7 @@ public class MouseKeysMainPageFragment extends DashboardFragment
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.PHYSICAL_KEYBOARD_A11Y; return SettingsEnums.SETTINGS_PHYSICAL_KEYBOARD_MOUSE_KEYS;
} }
@Override @Override

10
src/com/android/settings/inputmethod/MouseReverseVerticalScrollingPreferenceController.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.inputmethod; package com.android.settings.inputmethod;
import static android.app.settings.SettingsEnums.ACTION_MOUSE_REVERSE_VERTICAL_SCROLLING_DISABLED;
import static android.app.settings.SettingsEnums.ACTION_MOUSE_REVERSE_VERTICAL_SCROLLING_ENABLED;
import android.content.Context; import android.content.Context;
import android.hardware.input.InputSettings; import android.hardware.input.InputSettings;
@@ -23,12 +26,16 @@ import androidx.annotation.NonNull;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class MouseReverseVerticalScrollingPreferenceController extends TogglePreferenceController { public class MouseReverseVerticalScrollingPreferenceController extends TogglePreferenceController {
private final MetricsFeatureProvider mMetricsFeatureProvider;
public MouseReverseVerticalScrollingPreferenceController( public MouseReverseVerticalScrollingPreferenceController(
@NonNull Context context, @NonNull String key) { @NonNull Context context, @NonNull String key) {
super(context, key); super(context, key);
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
} }
@Override @Override
@@ -39,6 +46,9 @@ public class MouseReverseVerticalScrollingPreferenceController extends TogglePre
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
InputSettings.setMouseReverseVerticalScrolling(mContext, isChecked); InputSettings.setMouseReverseVerticalScrolling(mContext, isChecked);
mMetricsFeatureProvider.action(mContext,
isChecked ? ACTION_MOUSE_REVERSE_VERTICAL_SCROLLING_ENABLED :
ACTION_MOUSE_REVERSE_VERTICAL_SCROLLING_DISABLED);
return true; return true;
} }

57
src/com/android/settings/inputmethod/MouseScrollingAccelerationPreferenceController.java Normal file
View File

@@ -0,0 +1,57 @@
/*
* Copyright 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.inputmethod;
import android.content.Context;
import android.hardware.input.InputSettings;
import androidx.annotation.NonNull;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class MouseScrollingAccelerationPreferenceController extends TogglePreferenceController {
public MouseScrollingAccelerationPreferenceController(
@NonNull Context context, @NonNull String key) {
super(context, key);
}
@Override
public boolean isChecked() {
return !InputSettings.isMouseScrollingAccelerationEnabled(mContext);
}
@Override
public boolean setChecked(boolean isChecked) {
InputSettings.setMouseScrollingAcceleration(mContext, !isChecked);
return true;
}
@Override
public int getAvailabilityStatus() {
if (!InputSettings.isMouseScrollingAccelerationFeatureFlagEnabled()) {
return UNSUPPORTED_ON_DEVICE;
}
return AVAILABLE;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_system;
}
}

10
src/com/android/settings/inputmethod/MouseSwapPrimaryButtonPreferenceController.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.inputmethod; package com.android.settings.inputmethod;
import static android.app.settings.SettingsEnums.ACTION_MOUSE_SWAP_PRIMARY_BUTTON_DISABLED;
import static android.app.settings.SettingsEnums.ACTION_MOUSE_SWAP_PRIMARY_BUTTON_ENABLED;
import android.content.Context; import android.content.Context;
import android.hardware.input.InputSettings; import android.hardware.input.InputSettings;
@@ -23,12 +26,16 @@ import androidx.annotation.NonNull;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class MouseSwapPrimaryButtonPreferenceController extends TogglePreferenceController { public class MouseSwapPrimaryButtonPreferenceController extends TogglePreferenceController {
private final MetricsFeatureProvider mMetricsFeatureProvider;
public MouseSwapPrimaryButtonPreferenceController( public MouseSwapPrimaryButtonPreferenceController(
@NonNull Context context, @NonNull String key) { @NonNull Context context, @NonNull String key) {
super(context, key); super(context, key);
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
} }
@Override @Override
@@ -39,6 +46,9 @@ public class MouseSwapPrimaryButtonPreferenceController extends TogglePreference
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
InputSettings.setMouseSwapPrimaryButton(mContext, isChecked); InputSettings.setMouseSwapPrimaryButton(mContext, isChecked);
mMetricsFeatureProvider.action(mContext,
isChecked ? ACTION_MOUSE_SWAP_PRIMARY_BUTTON_ENABLED :
ACTION_MOUSE_SWAP_PRIMARY_BUTTON_DISABLED);
return true; return true;
} }

13
src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
View File

@@ -31,7 +31,6 @@ import androidx.preference.PreferenceScreen
import com.android.settings.R import com.android.settings.R
import com.android.settings.core.BasePreferenceController import com.android.settings.core.BasePreferenceController
import com.android.settings.datausage.DataUsageUtils import com.android.settings.datausage.DataUsageUtils
import com.android.settings.datausage.lib.DataUsageFormatter.FormattedDataUsage
import com.android.settings.datausage.lib.DataUsageLib import com.android.settings.datausage.lib.DataUsageLib
import com.android.settings.datausage.lib.NetworkCycleDataRepository import com.android.settings.datausage.lib.NetworkCycleDataRepository
import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.AllTimeRange import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.AllTimeRange
@@ -88,7 +87,7 @@ class DataUsagePreferenceController(context: Context, key: String) :
getDataUsageSummaryAndEnabled() getDataUsageSummaryAndEnabled()
} }
preference.isEnabled = enabled preference.isEnabled = enabled
preference.summary = summary?.displayText preference.summary = summary
} }
private fun getNetworkTemplate(): NetworkTemplate? = private fun getNetworkTemplate(): NetworkTemplate? =
@@ -100,12 +99,16 @@ class DataUsagePreferenceController(context: Context, key: String) :
fun createNetworkCycleDataRepository(): NetworkCycleDataRepository? = fun createNetworkCycleDataRepository(): NetworkCycleDataRepository? =
networkTemplate?.let { NetworkCycleDataRepository(mContext, it) } networkTemplate?.let { NetworkCycleDataRepository(mContext, it) }
private fun getDataUsageSummaryAndEnabled(): Pair<FormattedDataUsage?, Boolean> { private fun getDataUsageSummaryAndEnabled(): Pair<String?, Boolean> {
val repository = createNetworkCycleDataRepository() ?: return null to false val repository = createNetworkCycleDataRepository() ?: return null to false
repository.loadFirstCycle()?.let { usageData -> repository.loadFirstCycle()?.let { usageData ->
val formattedDataUsage = usageData.formatUsage(mContext) val formattedDataUsage =
.format(mContext, R.string.data_usage_template, usageData.formatDateRange(mContext)) mContext.getString(
R.string.data_usage_template,
usageData.formatUsage(mContext),
usageData.formatDateRange(mContext),
)
val hasUsage = usageData.usage > 0 || repository.queryUsage(AllTimeRange).usage > 0 val hasUsage = usageData.usage > 0 || repository.queryUsage(AllTimeRange).usage > 0
return formattedDataUsage to hasUsage return formattedDataUsage to hasUsage
} }

2
src/com/android/settings/spa/app/appinfo/AppDataUsagePreference.kt
View File

@@ -113,7 +113,7 @@ private class AppDataUsagePresenter(
} else { } else {
context.getString( context.getString(
R.string.data_summary_format, R.string.data_summary_format,
appUsageData.formatUsage(context).displayText, appUsageData.formatUsage(context),
appUsageData.formatStartDate(context), appUsageData.formatStartDate(context),
) )
} }

103
tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickCursorAreaSizeControllerTest.java Normal file
View File

@@ -0,0 +1,103 @@
/*
* Copyright 2025 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.kotlin.VerificationKt.verify;
import android.content.Context;
import android.content.SharedPreferences;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link ToggleAutoclickCursorAreaSizeController}. */
@RunWith(RobolectricTestRunner.class)
public class ToggleAutoclickCursorAreaSizeControllerTest {
private static final String PREFERENCE_KEY = "accessibility_control_autoclick_cursor_area_size";
private static final String PACKAGE = "package";
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
private final Context mContext = ApplicationProvider.getApplicationContext();
private ToggleAutoclickCursorAreaSizeController mController;
@Before
public void setUp() {
mController = new ToggleAutoclickCursorAreaSizeController(mContext, PREFERENCE_KEY);
}
@Test
@EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)
public void getAvailabilityStatus_availableWhenFlagOn() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@DisableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)
public void getAvailabilityStatus_conditionallyUnavailableWhenFlagOn() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
}
@Test
public void onStart_registerOnSharedPreferenceChangeListener() {
final SharedPreferences prefs = mock(SharedPreferences.class);
final Context context = mock(Context.class);
doReturn(PACKAGE).when(context).getPackageName();
doReturn(prefs).when(context).getSharedPreferences(anyString(), anyInt());
final ToggleAutoclickCursorAreaSizeController controller =
new ToggleAutoclickCursorAreaSizeController(context, PREFERENCE_KEY);
controller.onStart();
verify(prefs).registerOnSharedPreferenceChangeListener(controller);
}
@Test
public void onStop_unregisterOnSharedPreferenceChangeListener() {
final SharedPreferences prefs = mock(SharedPreferences.class);
final Context context = mock(Context.class);
doReturn(PACKAGE).when(context).getPackageName();
doReturn(prefs).when(context).getSharedPreferences(anyString(), anyInt());
final ToggleAutoclickCursorAreaSizeController controller =
new ToggleAutoclickCursorAreaSizeController(context, PREFERENCE_KEY);
controller.onStop();
verify(prefs).unregisterOnSharedPreferenceChangeListener(controller);
}
}

20
tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
View File

@@ -79,9 +79,12 @@ public class AdvancedBluetoothDetailsHeaderControllerTest {
private static final int LOW_BATTERY_LEVEL_THRESHOLD = 15; private static final int LOW_BATTERY_LEVEL_THRESHOLD = 15;
private static final int BATTERY_LEVEL_5 = 5; private static final int BATTERY_LEVEL_5 = 5;
private static final int BATTERY_LEVEL_50 = 50; private static final int BATTERY_LEVEL_50 = 50;
private static final int METADATA_FAST_PAIR_CUSTOMIZED_FIELDS = 25;
private static final String ICON_URI = "content://test.provider/icon.png"; private static final String ICON_URI = "content://test.provider/icon.png";
private static final String MAC_ADDRESS = "04:52:C7:0B:D8:3C"; private static final String MAC_ADDRESS = "04:52:C7:0B:D8:3C";
private static final String DEVICE_SUMMARY = "test summary"; private static final String DEVICE_SUMMARY = "test summary";
private static final String TEMP_BOND_METADATA =
"<TEMP_BOND_TYPE>le_audio_sharing</TEMP_BOND_TYPE>";
private Context mContext; private Context mContext;
@@ -531,6 +534,23 @@ public class AdvancedBluetoothDetailsHeaderControllerTest {
assertThat(button.getVisibility()).isEqualTo(View.VISIBLE); assertThat(button.getVisibility()).isEqualTo(View.VISIBLE);
} }
@Test
@EnableFlags({Flags.FLAG_ENABLE_BLUETOOTH_DEVICE_DETAILS_POLISH,
com.android.settingslib.flags.Flags.FLAG_ENABLE_TEMPORARY_BOND_DEVICES_UI})
public void temporaryBondDevice_renameButtonNotShown() {
when(mBluetoothDevice.getMetadata(BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET))
.thenReturn("true".getBytes());
when(mBluetoothDevice.getMetadata(METADATA_FAST_PAIR_CUSTOMIZED_FIELDS))
.thenReturn(TEMP_BOND_METADATA.getBytes());
Set<CachedBluetoothDevice> cacheBluetoothDevices = new HashSet<>();
when(mCachedDevice.getMemberDevice()).thenReturn(cacheBluetoothDevices);
mController.onStart();
ImageButton button = mLayoutPreference.findViewById(R.id.rename_button);
assertThat(button.getVisibility()).isEqualTo(View.GONE);
}
private void assertBatteryPredictionVisible(LinearLayout linearLayout, int visible) { private void assertBatteryPredictionVisible(LinearLayout linearLayout, int visible) {
final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction); final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction);
assertThat(textView.getVisibility()).isEqualTo(visible); assertThat(textView.getVisibility()).isEqualTo(visible);

11
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.datausage; package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
@@ -92,15 +90,6 @@ public class DataUsageSummaryTest {
doNothing().when(mDataUsageSummary).addWifiSection(); doNothing().when(mDataUsageSummary).addWifiSection();
} }
@Test
public void formatUsage_shouldLookLikeFormatFileSize() {
final long usage = 2147483648L; // 2GB
final String formattedUsage =
DataUsageSummary.formatUsage(mContext, "^1", usage).toString();
final CharSequence formattedInIECUnit = DataUsageUtils.formatDataUsage(mContext, usage);
assertThat(formattedUsage).isEqualTo(formattedInIECUnit);
}
@Test @Test
@Config(shadows = ShadowSubscriptionManager.class) @Config(shadows = ShadowSubscriptionManager.class)
public void configuration_withSim_shouldShowMobileAndWifi() { public void configuration_withSim_shouldShowMobileAndWifi() {

9
tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
View File

@@ -29,7 +29,6 @@ import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.DataUnit;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -74,14 +73,6 @@ public final class DataUsageUtilsTest {
assertThat(hasMobileData).isFalse(); assertThat(hasMobileData).isFalse();
} }
@Test
public void formatDataUsage_useIECUnit() {
final CharSequence formattedDataUsage = DataUsageUtils.formatDataUsage(
mContext, DataUnit.GIBIBYTES.toBytes(1));
assertThat(formattedDataUsage).isEqualTo("1.00 GB");
}
@Test @Test
public void hasEthernet_shouldQueryEthernetSummaryForUser() throws Exception { public void hasEthernet_shouldQueryEthernetSummaryForUser() throws Exception {
ShadowPackageManager pm = shadowOf(RuntimeEnvironment.application.getPackageManager()); ShadowPackageManager pm = shadowOf(RuntimeEnvironment.application.getPackageManager());

12
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForCameraPreferenceControllerTest.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.gestures; package com.android.settings.gestures;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_DISABLED_MODE;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_MULTI_TARGET_MODE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -72,7 +75,8 @@ public class DoubleTapPowerForCameraPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_setDoubleTapPowerGestureNotAvailable_preferenceUnsupported() { public void getAvailabilityStatus_setDoubleTapPowerGestureNotAvailable_preferenceUnsupported() {
when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false); when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMode)).thenReturn(
DOUBLE_TAP_POWER_DISABLED_MODE);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE); .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
@@ -80,7 +84,8 @@ public class DoubleTapPowerForCameraPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_setDoubleTapPowerButtonDisabled_preferenceDisabled() { public void getAvailabilityStatus_setDoubleTapPowerButtonDisabled_preferenceDisabled() {
when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true); when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMode)).thenReturn(
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false); DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
@@ -89,7 +94,8 @@ public class DoubleTapPowerForCameraPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_setDoubleTapPowerCameraLaunchEnabled_preferenceEnabled() { public void getAvailabilityStatus_setDoubleTapPowerCameraLaunchEnabled_preferenceEnabled() {
when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true); when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMode)).thenReturn(
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true); DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())

12
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerForWalletPreferenceControllerTest.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.gestures; package com.android.settings.gestures;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_DISABLED_MODE;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_MULTI_TARGET_MODE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -74,7 +77,8 @@ public class DoubleTapPowerForWalletPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_setDoubleTapPowerGestureNotAvailable_preferenceUnsupported() { public void getAvailabilityStatus_setDoubleTapPowerGestureNotAvailable_preferenceUnsupported() {
when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false); when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMode)).thenReturn(
DOUBLE_TAP_POWER_DISABLED_MODE);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE); .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
@@ -82,7 +86,8 @@ public class DoubleTapPowerForWalletPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_setDoubleTapPowerButtonDisabled_preferenceDisabled() { public void getAvailabilityStatus_setDoubleTapPowerButtonDisabled_preferenceDisabled() {
when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true); when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMode)).thenReturn(
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false); DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
@@ -91,7 +96,8 @@ public class DoubleTapPowerForWalletPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_setDoubleTapPowerWalletLaunchEnabled_preferenceEnabled() { public void getAvailabilityStatus_setDoubleTapPowerWalletLaunchEnabled_preferenceEnabled() {
when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true); when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMode)).thenReturn(
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true); DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())

9
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerMainSwitchPreferenceControllerTest.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.gestures; package com.android.settings.gestures;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_DISABLED_MODE;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_MULTI_TARGET_MODE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -54,7 +57,8 @@ public class DoubleTapPowerMainSwitchPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_setDoubleTapPowerGestureAvailable_preferenceEnabled() { public void getAvailabilityStatus_setDoubleTapPowerGestureAvailable_preferenceEnabled() {
when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true); when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMode)).thenReturn(
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE); .isEqualTo(BasePreferenceController.AVAILABLE);
@@ -62,7 +66,8 @@ public class DoubleTapPowerMainSwitchPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_setDoubleTapPowerGestureUnavailable_preferenceUnsupported() { public void getAvailabilityStatus_setDoubleTapPowerGestureUnavailable_preferenceUnsupported() {
when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false); when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMode)).thenReturn(
DOUBLE_TAP_POWER_DISABLED_MODE);
assertThat(mController.getAvailabilityStatus()) assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE); .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);

145
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
View File

@@ -20,6 +20,9 @@ import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_D
import static android.provider.Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED; import static android.provider.Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED;
import static com.android.settings.gestures.DoubleTapPowerPreferenceController.isSuggestionComplete; import static com.android.settings.gestures.DoubleTapPowerPreferenceController.isSuggestionComplete;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_DISABLED_MODE;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_LAUNCH_CAMERA_MODE;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_MULTI_TARGET_MODE;
import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.OFF; import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.OFF;
import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.ON; import static com.android.settings.gestures.DoubleTapPowerToOpenCameraPreferenceController.ON;
@@ -58,7 +61,8 @@ import org.robolectric.annotation.Config;
@Config(shadows = SettingsShadowResources.class) @Config(shadows = SettingsShadowResources.class)
public class DoubleTapPowerPreferenceControllerTest { public class DoubleTapPowerPreferenceControllerTest {
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); @Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private Context mContext; private Context mContext;
private ContentResolver mContentResolver; private ContentResolver mContentResolver;
private DoubleTapPowerPreferenceController mController; private DoubleTapPowerPreferenceController mController;
@@ -83,18 +87,30 @@ public class DoubleTapPowerPreferenceControllerTest {
@Test @Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP) @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void isAvailable_flagEnabled_configIsTrue_returnsTrue() { public void isAvailable_flagEnabled_configIsMultiTargetMode_returnsTrue() {
SettingsShadowResources.overrideResource( SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, Boolean.TRUE); com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
assertThat(mController.isAvailable()).isTrue(); assertThat(mController.isAvailable()).isTrue();
} }
@Test @Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP) @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void isAvailable_flagEnabled_configIsFalse_returnsFalse() { public void isAvailable_flagEnabled_configIsCameraLaunchMode_returnsTrue() {
SettingsShadowResources.overrideResource( SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, Boolean.FALSE); com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_LAUNCH_CAMERA_MODE);
assertThat(mController.isAvailable()).isTrue();
}
@Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void isAvailable_flagEnabled_configIsDisabledMode_returnsFalse() {
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_DISABLED_MODE);
assertThat(mController.isAvailable()).isFalse(); assertThat(mController.isAvailable()).isFalse();
} }
@@ -121,18 +137,20 @@ public class DoubleTapPowerPreferenceControllerTest {
@Test @Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP) @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void isSuggestionCompleted_enableFlag_doubleTapPower_trueWhenNotAvailable() { public void isSuggestionCompleted_flagEnabled_configIsMultiTargetMode_trueWhenNotAvailable() {
SettingsShadowResources.overrideResource( SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, false); com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_DISABLED_MODE);
assertThat(isSuggestionComplete(mContext, null /* prefs */)).isTrue(); assertThat(isSuggestionComplete(mContext, null /* prefs */)).isTrue();
} }
@Test @Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP) @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void isSuggestionCompleted_enableFlag_doubleTapPower_falseWhenNotVisited() { public void isSuggestionCompleted_enableFlag_configIsMultiTargetMode_falseWhenNotVisited() {
SettingsShadowResources.overrideResource( SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, true); com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
// No stored value in shared preferences if not visited yet. // No stored value in shared preferences if not visited yet.
final SharedPreferences prefs = final SharedPreferences prefs =
new SuggestionFeatureProviderImpl().getSharedPrefs(mContext); new SuggestionFeatureProviderImpl().getSharedPrefs(mContext);
@@ -142,9 +160,10 @@ public class DoubleTapPowerPreferenceControllerTest {
@Test @Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP) @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void isSuggestionCompleted_enableFlag_doubleTapPower_trueWhenVisited() { public void isSuggestionCompleted_enableFlag_configIsMultiTargetMode_trueWhenVisited() {
SettingsShadowResources.overrideResource( SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_doubleTapPowerGestureEnabled, true); com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
// No stored value in shared preferences if not visited yet. // No stored value in shared preferences if not visited yet.
final SharedPreferences prefs = final SharedPreferences prefs =
new SuggestionFeatureProviderImpl().getSharedPrefs(mContext); new SuggestionFeatureProviderImpl().getSharedPrefs(mContext);
@@ -189,13 +208,30 @@ public class DoubleTapPowerPreferenceControllerTest {
@Test @Test
@DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP) @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void displayPreference_flagDisabled_doubleTapPowerLegacyTitleIsDisplayed() { public void displayPreference_flagDisabled_cameraLaunchTitleIsDisplayed() {
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
assertThat( assertThat(
TextUtils.equals( TextUtils.equals(
mPreference.getTitle(), mPreference.getTitle(),
mContext.getText(R.string.double_tap_power_for_camera_title))) mContext.getText(R.string.double_tap_power_for_camera_title)))
.isTrue();
}
@Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void
displayPreference_flagEnabled_configIsCameraLaunchMode_cameraLaunchTitleIsDisplayed() {
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_LAUNCH_CAMERA_MODE);
mController.displayPreference(mScreen);
assertThat(
TextUtils.equals(
mPreference.getTitle(),
mContext.getText(R.string.double_tap_power_for_camera_title)))
.isTrue(); .isTrue();
} }
@@ -206,9 +242,9 @@ public class DoubleTapPowerPreferenceControllerTest {
Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON); Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
assertThat( assertThat(
TextUtils.equals( TextUtils.equals(
mController.getSummary(), mController.getSummary(),
mContext.getText(R.string.gesture_setting_on))) mContext.getText(R.string.gesture_setting_on)))
.isTrue(); .isTrue();
} }
@@ -219,9 +255,42 @@ public class DoubleTapPowerPreferenceControllerTest {
Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF); Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
assertThat( assertThat(
TextUtils.equals( TextUtils.equals(
mController.getSummary(), mController.getSummary(),
mContext.getText(R.string.gesture_setting_off))) mContext.getText(R.string.gesture_setting_off)))
.isTrue();
}
@Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void getSummary_flagEnabled_doubleTapPowerEnabled_configIsCameraLaunchMode_returnsOn() {
// Set the setting to be enabled.
Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_LAUNCH_CAMERA_MODE);
assertThat(
TextUtils.equals(
mController.getSummary(),
mContext.getText(R.string.gesture_setting_on)))
.isTrue();
}
@Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void
getSummary_flagEnabled_doubleTapPowerDisabled_configIsCameraLaunchMode_returnsOff() {
// Set the setting to be disabled.
Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_LAUNCH_CAMERA_MODE);
assertThat(
TextUtils.equals(
mController.getSummary(),
mContext.getText(R.string.gesture_setting_off)))
.isTrue(); .isTrue();
} }
@@ -233,9 +302,9 @@ public class DoubleTapPowerPreferenceControllerTest {
mContentResolver, DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, 0 /* OFF */); mContentResolver, DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, 0 /* OFF */);
assertThat( assertThat(
TextUtils.equals( TextUtils.equals(
mController.getSummary(), mController.getSummary(),
mContext.getText(R.string.gesture_setting_off))) mContext.getText(R.string.gesture_setting_off)))
.isTrue(); .isTrue();
} }
@@ -248,13 +317,13 @@ public class DoubleTapPowerPreferenceControllerTest {
DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext); DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForCameraLaunch(mContext);
assertThat( assertThat(
TextUtils.equals( TextUtils.equals(
mController.getSummary(), mController.getSummary(),
mContext.getString( mContext.getString(
R.string.double_tap_power_summary, R.string.double_tap_power_summary,
mContext.getText(R.string.gesture_setting_on), mContext.getText(R.string.gesture_setting_on),
mContext.getText( mContext.getText(
R.string.double_tap_power_camera_action_summary)))) R.string.double_tap_power_camera_action_summary))))
.isTrue(); .isTrue();
} }
@@ -267,13 +336,13 @@ public class DoubleTapPowerPreferenceControllerTest {
DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext); DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonForWalletLaunch(mContext);
assertThat( assertThat(
TextUtils.equals( TextUtils.equals(
mController.getSummary(), mController.getSummary(),
mContext.getString( mContext.getString(
R.string.double_tap_power_summary, R.string.double_tap_power_summary,
mContext.getText(R.string.gesture_setting_on), mContext.getText(R.string.gesture_setting_on),
mContext.getText( mContext.getText(
R.string.double_tap_power_wallet_action_summary)))) R.string.double_tap_power_wallet_action_summary))))
.isTrue(); .isTrue();
} }
} }

56
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.gestures; package com.android.settings.gestures;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_LAUNCH_CAMERA_MODE;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_MULTI_TARGET_MODE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.DisableFlags;
@@ -25,6 +28,7 @@ import android.provider.SearchIndexableResource;
import android.service.quickaccesswallet.Flags; import android.service.quickaccesswallet.Flags;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
@@ -32,13 +36,16 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.List; import java.util.List;
@Config(shadows = SettingsShadowResources.class)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class DoubleTapPowerSettingsTest { public class DoubleTapPowerSettingsTest {
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); @Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private DoubleTapPowerSettings mSettings; private DoubleTapPowerSettings mSettings;
@Before @Before
@@ -48,10 +55,29 @@ public class DoubleTapPowerSettingsTest {
@Test @Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP) @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void getPreferenceScreenResId_flagEnabled_returnsFlagEnabledResId() { public void
getPreferenceScreenResId_flagEnabled_configIsMultiTargetMode_returnsMultiTargetResId() {
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
mSettings.onAttach(RuntimeEnvironment.getApplication());
assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.double_tap_power_settings); assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.double_tap_power_settings);
} }
@Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void
getPreferenceScreenResId_flagEnabled_configIsCameraMode_returnsCameraLaunchResId() {
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_LAUNCH_CAMERA_MODE);
mSettings.onAttach(RuntimeEnvironment.getApplication());
assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(
R.xml.double_tap_power_to_open_camera_settings);
}
@Test @Test
@DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP) @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void getPreferenceScreenResId_flagDisabled_returnsFlagDisabledResId() { public void getPreferenceScreenResId_flagDisabled_returnsFlagDisabledResId() {
@@ -61,7 +87,12 @@ public class DoubleTapPowerSettingsTest {
@Test @Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP) @EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void testSearchIndexProvider_flagEnabled_shouldIndexFlagEnabledResource() { public void
testSearchIndexProvider_flagEnabled_configIsMultiTargetMode_indexMultiTargetResId() {
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
final List<SearchIndexableResource> indexRes = final List<SearchIndexableResource> indexRes =
DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex( DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
RuntimeEnvironment.getApplication(), true /* enabled */); RuntimeEnvironment.getApplication(), true /* enabled */);
@@ -70,9 +101,26 @@ public class DoubleTapPowerSettingsTest {
assertThat(indexRes.get(0).xmlResId).isEqualTo(R.xml.double_tap_power_settings); assertThat(indexRes.get(0).xmlResId).isEqualTo(R.xml.double_tap_power_settings);
} }
@Test
@EnableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void
testSearchIndexProvider_flagEnabled_configIsCameraLaunchMode_indexCameraLaunchResId() {
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_doubleTapPowerGestureMode,
DOUBLE_TAP_POWER_LAUNCH_CAMERA_MODE);
final List<SearchIndexableResource> indexRes =
DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
RuntimeEnvironment.getApplication(), true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(
R.xml.double_tap_power_to_open_camera_settings);
}
@Test @Test
@DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP) @DisableFlags(Flags.FLAG_LAUNCH_WALLET_OPTION_ON_POWER_DOUBLE_TAP)
public void testSearchIndexProvider_flagDisabled_shouldIndexFlagDisabledResource() { public void testSearchIndexProvider_flagDisabled_indexFlagDisabledResource() {
final List<SearchIndexableResource> indexRes = final List<SearchIndexableResource> indexRes =
DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex( DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
RuntimeEnvironment.getApplication(), true /* enabled */); RuntimeEnvironment.getApplication(), true /* enabled */);

70
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsUtilsTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.gestures; package com.android.settings.gestures;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_DISABLED_MODE;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.DOUBLE_TAP_POWER_MULTI_TARGET_MODE;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.OFF; import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.OFF;
import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.ON; import static com.android.settings.gestures.DoubleTapPowerSettingsUtils.ON;
@@ -55,18 +57,22 @@ public class DoubleTapPowerSettingsUtilsTest {
} }
@Test @Test
public void isDoubleTapPowerButtonGestureAvailable_setAvailable_returnsTrue() { public void isMultiTargetDoubleTapPowerButtonGestureAvailable_setAvailable_returnsTrue() {
when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(true); when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMode)).thenReturn(
DOUBLE_TAP_POWER_MULTI_TARGET_MODE);
assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext)) assertThat(DoubleTapPowerSettingsUtils.isMultiTargetDoubleTapPowerButtonGestureAvailable(
mContext))
.isTrue(); .isTrue();
} }
@Test @Test
public void isDoubleTapPowerButtonGestureAvailable_setUnavailable_returnsFalse() { public void isMultiTargetDoubleTapPowerButtonGestureAvailable_setUnavailable_returnsFalse() {
when(mResources.getBoolean(R.bool.config_doubleTapPowerGestureEnabled)).thenReturn(false); when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMode)).thenReturn(
DOUBLE_TAP_POWER_DISABLED_MODE);
assertThat(DoubleTapPowerSettingsUtils.isDoubleTapPowerButtonGestureAvailable(mContext)) assertThat(DoubleTapPowerSettingsUtils.isMultiTargetDoubleTapPowerButtonGestureAvailable(
mContext))
.isFalse(); .isFalse();
} }
@@ -103,10 +109,10 @@ public class DoubleTapPowerSettingsUtilsTest {
DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true); DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, true);
assertThat( assertThat(
Settings.Secure.getInt( Settings.Secure.getInt(
mContext.getContentResolver(), mContext.getContentResolver(),
Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
OFF)) OFF))
.isEqualTo(ON); .isEqualTo(ON);
} }
@@ -115,10 +121,10 @@ public class DoubleTapPowerSettingsUtilsTest {
DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false); DoubleTapPowerSettingsUtils.setDoubleTapPowerButtonGestureEnabled(mContext, false);
assertThat( assertThat(
Settings.Secure.getInt( Settings.Secure.getInt(
mContext.getContentResolver(), mContext.getContentResolver(),
Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED, Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED,
ON)) ON))
.isEqualTo(OFF); .isEqualTo(OFF);
} }
@@ -130,8 +136,8 @@ public class DoubleTapPowerSettingsUtilsTest {
DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE); DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
assertThat( assertThat(
DoubleTapPowerSettingsUtils DoubleTapPowerSettingsUtils
.isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext)) .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
.isTrue(); .isTrue();
} }
@@ -144,32 +150,32 @@ public class DoubleTapPowerSettingsUtilsTest {
DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE); DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
assertThat( assertThat(
DoubleTapPowerSettingsUtils DoubleTapPowerSettingsUtils
.isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext)) .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
.isFalse(); .isFalse();
} }
@Test @Test
public void public void
isDoubleTapPowerButtonGestureForCameraLaunchEnabled_defaultSetToCamera_returnsTrue() { isDoubleTapPowerButtonGestureForCameraLaunchEnabled_defaultSetToCamera_returnsTrue() {
when(mResources.getInteger(R.integer.config_defaultDoubleTapPowerGestureAction)) when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMultiTargetDefaultAction))
.thenReturn(DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE); .thenReturn(DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
assertThat( assertThat(
DoubleTapPowerSettingsUtils DoubleTapPowerSettingsUtils
.isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext)) .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
.isTrue(); .isTrue();
} }
@Test @Test
public void public void
isDoubleTapPowerButtonGestureForCameraLaunchEnabled_defaultNotCamera_returnsFalse() { isDoubleTapPowerButtonGestureForCameraLaunchEnabled_defaultNotCamera_returnsFalse() {
when(mResources.getInteger(R.integer.config_defaultDoubleTapPowerGestureAction)) when(mResources.getInteger(R.integer.config_doubleTapPowerGestureMultiTargetDefaultAction))
.thenReturn(DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE); .thenReturn(DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
assertThat( assertThat(
DoubleTapPowerSettingsUtils DoubleTapPowerSettingsUtils
.isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext)) .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(mContext))
.isFalse(); .isFalse();
} }
@@ -180,10 +186,10 @@ public class DoubleTapPowerSettingsUtilsTest {
assertThat(result).isTrue(); assertThat(result).isTrue();
assertThat( assertThat(
Settings.Secure.getInt( Settings.Secure.getInt(
mContext.getContentResolver(), mContext.getContentResolver(),
Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE, Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE)) DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE))
.isEqualTo(DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE); .isEqualTo(DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE);
} }
@@ -194,10 +200,10 @@ public class DoubleTapPowerSettingsUtilsTest {
assertThat(result).isTrue(); assertThat(result).isTrue();
assertThat( assertThat(
Settings.Secure.getInt( Settings.Secure.getInt(
mContext.getContentResolver(), mContext.getContentResolver(),
Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE, Settings.Secure.DOUBLE_TAP_POWER_BUTTON_GESTURE,
DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE)) DOUBLE_TAP_POWER_BUTTON_CAMERA_LAUNCH_VALUE))
.isEqualTo(DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE); .isEqualTo(DOUBLE_TAP_POWER_BUTTON_WALLET_LAUNCH_VALUE);
} }
} }

122
tests/robotests/src/com/android/settings/inputmethod/MouseScrollingAccelerationPreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,122 @@
/*
* Copyright 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.inputmethod;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.hardware.input.InputSettings;
import android.os.UserHandle;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
import com.android.hardware.input.Flags;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
/** Tests for {@link MouseScrollingAccelerationPreferenceController} */
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
})
public class MouseScrollingAccelerationPreferenceControllerTest {
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private static final String PREFERENCE_KEY = "mouse_scrolling_acceleration";
private static final String SETTING_KEY = Settings.System.MOUSE_SCROLLING_ACCELERATION;
private Context mContext;
private MouseScrollingAccelerationPreferenceController mController;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mController = new MouseScrollingAccelerationPreferenceController(
mContext, PREFERENCE_KEY);
}
@Test
@EnableFlags(Flags.FLAG_MOUSE_SCROLLING_ACCELERATION)
public void getAvailabilityStatus_expected() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@DisableFlags(Flags.FLAG_MOUSE_SCROLLING_ACCELERATION)
public void getAvailabilityStatus_flagIsDisabled_notSupport() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
@Test
@EnableFlags(Flags.FLAG_MOUSE_SCROLLING_ACCELERATION)
public void setChecked_false_shouldReturnTrue() {
mController.setChecked(false);
boolean isEnabled = InputSettings.isMouseScrollingAccelerationEnabled(mContext);
assertThat(isEnabled).isTrue();
}
@Test
@EnableFlags(Flags.FLAG_MOUSE_SCROLLING_ACCELERATION)
public void setChecked_false_shouldReturnFalse() {
mController.setChecked(true);
boolean isEnabled = InputSettings.isMouseScrollingAccelerationEnabled(mContext);
assertThat(isEnabled).isFalse();
}
@Test
@EnableFlags(Flags.FLAG_MOUSE_SCROLLING_ACCELERATION)
public void isChecked_providerPutInt1_returnFalse() {
Settings.System.putIntForUser(
mContext.getContentResolver(),
SETTING_KEY,
1,
UserHandle.USER_CURRENT);
boolean result = mController.isChecked();
assertThat(result).isFalse();
}
@Test
@EnableFlags(Flags.FLAG_MOUSE_SCROLLING_ACCELERATION)
public void isChecked_providerPutInt0_returnTrue() {
Settings.System.putIntForUser(
mContext.getContentResolver(),
SETTING_KEY,
0,
UserHandle.USER_CURRENT);
boolean result = mController.isChecked();
assertThat(result).isTrue();
}
}

14
tests/spa_unit/src/com/android/settings/datausage/AppDataUsageSummaryControllerTest.kt
View File

@@ -56,13 +56,10 @@ class AppDataUsageSummaryControllerTest {
composeTestRule.onNode(hasTextExactly("Total", "6.75 kB")).assertIsDisplayed() composeTestRule.onNode(hasTextExactly("Total", "6.75 kB")).assertIsDisplayed()
composeTestRule.onNode(hasTextExactly("Foreground", "5.54 kB")).assertIsDisplayed() composeTestRule.onNode(hasTextExactly("Foreground", "5.54 kB")).assertIsDisplayed()
composeTestRule.onNode(hasTextExactly("Background", "1.21 kB")).assertIsDisplayed() composeTestRule.onNode(hasTextExactly("Background", "1.21 kB")).assertIsDisplayed()
composeTestRule.onNodeWithContentDescription("6.75 kB").assertIsDisplayed()
composeTestRule.onNodeWithContentDescription("5.54 kB").assertIsDisplayed()
composeTestRule.onNodeWithContentDescription("1.21 kB").assertIsDisplayed()
} }
@Test @Test
fun summary_zero() { fun summary_smallByte() {
val appUsage = NetworkUsageDetailsData( val appUsage = NetworkUsageDetailsData(
range = Range(1L, 2L), range = Range(1L, 2L),
totalUsage = 3, totalUsage = 3,
@@ -75,12 +72,9 @@ class AppDataUsageSummaryControllerTest {
controller.Content() controller.Content()
} }
composeTestRule.onNode(hasTextExactly("Total", "3 B")).assertIsDisplayed() composeTestRule.onNode(hasTextExactly("Total", "3 byte")).assertIsDisplayed()
composeTestRule.onNode(hasTextExactly("Foreground", "1 B")).assertIsDisplayed() composeTestRule.onNode(hasTextExactly("Foreground", "1 byte")).assertIsDisplayed()
composeTestRule.onNode(hasTextExactly("Background", "2 B")).assertIsDisplayed() composeTestRule.onNode(hasTextExactly("Background", "2 byte")).assertIsDisplayed()
composeTestRule.onNodeWithContentDescription("3 byte").assertIsDisplayed()
composeTestRule.onNodeWithContentDescription("1 byte").assertIsDisplayed()
composeTestRule.onNodeWithContentDescription("2 byte").assertIsDisplayed()
} }
private companion object { private companion object {

12
tests/spa_unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.kt
View File

@@ -182,8 +182,8 @@ class DataUsageSummaryPreferenceControllerTest {
val limitInfo = argumentCaptor { val limitInfo = argumentCaptor {
verify(preference).setLimitInfo(capture()) verify(preference).setLimitInfo(capture())
}.firstValue.toString() }.firstValue.toString()
assertThat(limitInfo).isEqualTo("1 B data warning") assertThat(limitInfo).isEqualTo("1 byte data warning")
verify(preference).setLabels("0 B", "1 B") verify(preference).setLabels("0 byte", "1 byte")
} }
@Test @Test
@@ -200,8 +200,8 @@ class DataUsageSummaryPreferenceControllerTest {
val limitInfo = argumentCaptor { val limitInfo = argumentCaptor {
verify(preference).setLimitInfo(capture()) verify(preference).setLimitInfo(capture())
}.firstValue.toString() }.firstValue.toString()
assertThat(limitInfo).isEqualTo("1 B data limit") assertThat(limitInfo).isEqualTo("1 byte data limit")
verify(preference).setLabels("0 B", "1 B") verify(preference).setLabels("0 byte", "1 byte")
} }
@Test @Test
@@ -219,7 +219,7 @@ class DataUsageSummaryPreferenceControllerTest {
verify(preference).setLimitInfo(capture()) verify(preference).setLimitInfo(capture())
}.firstValue.toString() }.firstValue.toString()
assertThat(limitInfo).isEqualTo("512 MB data warning / 1.00 GB data limit") assertThat(limitInfo).isEqualTo("512 MB data warning / 1.00 GB data limit")
verify(preference).setLabels("0 B", "1.00 GB") verify(preference).setLabels("0 byte", "1.00 GB")
} }
@Test @Test
@@ -256,7 +256,7 @@ class DataUsageSummaryPreferenceControllerTest {
POSITIVE_DATA_PLAN_INFO.dataPlanSize, POSITIVE_DATA_PLAN_INFO.dataPlanSize,
) )
verify(preference).setChartEnabled(true) verify(preference).setChartEnabled(true)
verify(preference).setLabels("0 B", "9 B") verify(preference).setLabels("0 byte", "9 byte")
val progress = argumentCaptor { val progress = argumentCaptor {
verify(preference).setProgress(capture()) verify(preference).setProgress(capture())
}.firstValue }.firstValue

12
tests/spa_unit/src/com/android/settings/datausage/lib/DataUsageFormatterTest.kt
View File

@@ -21,7 +21,6 @@ import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.datausage.lib.DataUsageFormatter.Companion.getBytesDisplayUnit import com.android.settings.datausage.lib.DataUsageFormatter.Companion.getBytesDisplayUnit
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
@@ -33,26 +32,23 @@ class DataUsageFormatterTest {
@Test @Test
fun formatDataUsage_0() { fun formatDataUsage_0() {
val (displayText, contentDescription) = dataUsageFormatter.formatDataUsage(0) val displayText = dataUsageFormatter.formatDataUsage(0)
assertThat(displayText).isEqualTo("0 B") assertThat(displayText).isEqualTo("0 byte")
assertThat(contentDescription).isEqualTo("0 byte")
} }
@Test @Test
fun formatDataUsage_1000() { fun formatDataUsage_1000() {
val (displayText, contentDescription) = dataUsageFormatter.formatDataUsage(1000) val displayText = dataUsageFormatter.formatDataUsage(1000)
assertThat(displayText).isEqualTo("0.98 kB") assertThat(displayText).isEqualTo("0.98 kB")
assertThat(contentDescription).isEqualTo("0.98 kB")
} }
@Test @Test
fun formatDataUsage_2000000() { fun formatDataUsage_2000000() {
val (displayText, contentDescription) = dataUsageFormatter.formatDataUsage(2000000) val displayText = dataUsageFormatter.formatDataUsage(2000000)
assertThat(displayText).isEqualTo("1.91 MB") assertThat(displayText).isEqualTo("1.91 MB")
assertThat(contentDescription).isEqualTo("1.91 MB")
} }
@Test @Test

4
tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt
View File

@@ -143,7 +143,7 @@ class DataUsagePreferenceControllerTest {
controller.onViewCreated(TestLifecycleOwner()) controller.onViewCreated(TestLifecycleOwner())
waitUntil { preference.isEnabled } waitUntil { preference.isEnabled }
waitUntil { preference.summary?.contains("0 B used") == true } waitUntil { preference.summary?.contains("0 byte used") == true }
} }
@Test @Test
@@ -159,7 +159,7 @@ class DataUsagePreferenceControllerTest {
controller.onViewCreated(TestLifecycleOwner()) controller.onViewCreated(TestLifecycleOwner())
waitUntil { !preference.isEnabled } waitUntil { !preference.isEnabled }
waitUntil { preference.summary?.contains("0 B used") == true } waitUntil { preference.summary?.contains("0 byte used") == true }
} }
@Test @Test

2
tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDataUsagePreferenceTest.kt
View File

@@ -134,7 +134,7 @@ class AppDataUsagePreferenceTest {
setContent() setContent()
composeTestRule.waitUntilExists(hasText("123 B used since Oct 25, 2022")) composeTestRule.waitUntilExists(hasText("123 byte used since Oct 25, 2022"))
} }
@Test @Test

173
tests/unit/src/com/android/settings/development/BackAnimationPreferenceControllerTest.java
View File

@@ -1,173 +0,0 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import android.app.Instrumentation;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.os.UserHandle;
import android.platform.test.annotations.RequiresFlagsDisabled;
import android.platform.test.annotations.RequiresFlagsEnabled;
import android.platform.test.flag.junit.CheckFlagsRule;
import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import android.provider.Settings;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import com.android.window.flags.Flags;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@RunWith(AndroidJUnit4.class)
public class BackAnimationPreferenceControllerTest {
private static final int SETTING_VALUE_OFF = 0;
private static final int SETTING_VALUE_ON = 1;
private SwitchPreference mPreference;
private Context mContext;
private BackAnimationPreferenceController mController;
private Looper mLooper;
@Rule
public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
mContext = instrumentation.getTargetContext();
mController = new BackAnimationPreferenceController(mContext);
mPreference = new SwitchPreference(mContext);
if (Looper.myLooper() == null) {
Looper.prepare();
}
mLooper = Looper.myLooper();
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ENABLE_BACK_ANIMATION, -1);
final PreferenceManager preferenceManager = new PreferenceManager(mContext);
final PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
mPreference.setKey(mController.getPreferenceKey());
screen.addPreference(mPreference);
mController.displayPreference(screen);
}
@Test
@RequiresFlagsEnabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS)
public void controllerNotAvailable_whenAconfigFlagEnabled() {
assertFalse(mController.isAvailable());
}
@Test
@RequiresFlagsDisabled(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_ANIMS)
public void controllerAvailable_whenAconfigFlagDisabled() {
assertTrue(mController.isAvailable());
}
@Test
public void onPreferenceChange_switchEnabled_shouldEnableBackAnimations() {
mController.onPreferenceChange(mPreference, true /* new value */);
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ENABLE_BACK_ANIMATION, -1 /* default */);
assertThat(mode).isEqualTo(SETTING_VALUE_ON);
}
@Test
public void onPreferenceChange_switchDisabled_shouldDisableBackAnimations() {
mController.onPreferenceChange(mPreference, false /* new value */);
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ENABLE_BACK_ANIMATION, -1 /* default */);
assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ENABLE_BACK_ANIMATION, SETTING_VALUE_ON);
mController.updateState(mPreference);
assertTrue(mPreference.isChecked());
}
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ENABLE_BACK_ANIMATION, SETTING_VALUE_OFF);
mController.updateState(mPreference);
assertFalse(mPreference.isChecked());
}
@Test
public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference()
throws InterruptedException {
ContentResolver contentResolver = mContext.getContentResolver();
int mode = doAndWaitForSettingChange(() -> mController.onDeveloperOptionsSwitchDisabled(),
contentResolver);
assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
assertFalse(mPreference.isEnabled());
assertFalse(mPreference.isChecked());
}
private int doAndWaitForSettingChange(Runnable runnable, ContentResolver contentResolver) {
CountDownLatch countDownLatch = new CountDownLatch(1);
ContentObserver settingsObserver =
new ContentObserver(new Handler(mLooper)) {
@Override
public void onChange(boolean selfChange, Uri uri) {
countDownLatch.countDown();
}
};
contentResolver.registerContentObserver(
Settings.Global.getUriFor(Settings.Global.ENABLE_BACK_ANIMATION),
false, settingsObserver, UserHandle.USER_SYSTEM
);
runnable.run();
try {
countDownLatch.await(500, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
Assert.fail(e.getMessage());
}
return Settings.Global.getInt(contentResolver,
Settings.Global.ENABLE_BACK_ANIMATION, -1 /* default */);
}
}