Sal Savage
da2e2c3e4a
Clean up BT stack log level preference controller and tests
...
Problem: These tests were failing because the resource ID used in the
test and its version of the R class resolved to a different integer
(and subsequently a different string array) than the R class used on
device. This was causing different string arrays with different lengths
and values to sometimes appear, especially when the source and tests
were builts separately.
Solution: Manually lookup the resource ID to use by name instead of
using the pre-baked R class and assuming its ID is correct. This allows
us to get the proper ID every time and trust the values in the array.
This trust allows for some clean up on the code and tests, such that now
our tests can iterate on values instead of relying on private constants
being made visible or even hardcoded values.
Flag: EXEMPT, test fix and minor refactor with no behavior change
Bug: 339148064
Test: atest com.android.settings.development.bluetooth.BluetoothStackLogPreferenceControllerTest
Change-Id: I8149bd06ed70589afb3797a9f453eb2a11c3c410
2024-07-11 15:11:06 -07:00
Diya Bera
80bec7adef
Update tests for mandatory biometrics
...
Flag: android.hardware.biometrics.Flag.MANDATORY_BIOMETRICS
Fixes: 352036009
Test: atest MainClearTest CombinedBiometricProfileSettingsTest
Change-Id: If778dcb138b82814621186ddd7f89d77dc4a9b18
2024-07-11 21:16:02 +00:00
Pat Manning
620755c293
Add Settings for vector-specific PointerIcon stroke colors.
...
Bug: 305193969
Test: PointerIconLoadingTest
Flag: android.view.flags.enable_vector_cursor_a11y_settings
Change-Id: I72213e8806fed451a0edb16d497406ffae5c1a44
2024-07-11 15:40:03 +00:00
Treehugger Robot
c5e168c830
Merge "Remove leftover "all" option from zen mode Apps page" into main
2024-07-11 14:01:53 +00:00
Pat Manning
1257610b0e
Update Touchpad settings page to include mouse.
...
Make each setting conditionally available based on touchpad or mouse
connected to device.
Bug: 269100659
Test: TrackpadBottomPreferenceControllerTest
Test: TrackpadReverseScrollingPreferenceControllerTest
Test: TrackpadTapToClickPreferenceControllerTest
Test: TrackpadSettingsControllerTest
Flag: android.view.flags.enable_vector_cursor_a11y_settings
Change-Id: I601c29e20d69227779481c0a491256e36cfd268f
2024-07-11 13:32:44 +00:00
Joseph Vincent
db223afdd8
Merge "Fix RTL alignment issue in private space education" into main
2024-07-11 12:06:48 +00:00
Android Build Coastguard Worker
31e8c6d57d
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28121446'] into 24Q3-release.
...
Change-Id: I062a7bf67678f78f60f360df0590c9b12b9c75a5
2024-07-11 04:33:00 +00:00
Zaiyue Xue
dc841cd077
AiCore reattribute feature
...
Bug: 344438848
Bug: 346706894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:164e2be9380ef0df6afe7616fb0bedc8eea6f899 )
Merged-In: Ifb18c2d156d11fcfdc67cff575ba800c4a6cc0fe
Change-Id: Ifb18c2d156d11fcfdc67cff575ba800c4a6cc0fe
2024-07-11 04:25:14 +00:00
Chaohui Wang
cd4cf67422
Clean up SubscriptionInfoEntity unused fields
...
It's safe since MobileNetworkDatabase is in memory only.
Bug: 348118234
Flag: EXEMPT clean up
Test: manual - check Mobile Settings
Change-Id: If170c65f4d0dfdc42c1cec9a56e25c516db4f75e
2024-07-11 04:15:37 +00:00
Kai Zhou
9775bd31f9
Wifi Sharing page uses a new enum for telemetry.
...
* Previous ID was shared by several pages.
* New ID is only used by this page.
Bug: b/349226088
Settings Intake: b/329012096
Test: atest WifiDppQrCodeGeneratorFragmentTest
Flag: com.android.settings.flags.enable_wifi_sharing_runtime_fragment
Change-Id: I22c8f3a216cf348460a645561be48b23a4bf0e7e
2024-07-11 02:30:12 +00:00
Daniel Norman
034e6db92e
Merge "Uses a custom state description for the Audio Balance seek bar." into main
2024-07-11 00:45:37 +00:00
Vincent Wang
e9c4adfaf1
Remove package biometric2 from AOSP settings
...
Flag: EXEMPT Remove legacy code from AOSP
Bug: 351977012
Test: Build pass
Change-Id: I2285ab8cc2776071c329d7432849aeffc28ed8ee
2024-07-11 00:06:41 +00:00
Matías Hernández
f85290cbbf
Remove leftover "all" option from zen mode Apps page
...
Bug: 308820027
Test: manual
Flag: android.app.modes_ui
Change-Id: I0b29b69a9544223eb8450ad59e528056ad429fbb
2024-07-10 19:30:51 +00:00
Matías Hernández
c56c2e0019
Merge "Add "rename" option to 3-dot menu" into main
2024-07-10 15:35:03 +00:00
Julia Reynolds
6a3a9d379b
Merge "Remove unneeded tests" into main
2024-07-10 14:43:07 +00:00
Julia Reynolds
5c6a6f2730
Remove unneeded tests
...
Test: ZenModePreferenceControllerTest
Flag: EXEMPT bugfix
Bug: 352036009
Change-Id: If2b12756c6984d60a3ccaaf1e9d0772143d6affd
2024-07-10 09:47:18 -04:00
Jason Chang
e37fca665b
Merge "Fix the wording order of personal and work are different in the device unlock settings" into main
2024-07-10 10:48:06 +00:00
Android Build Coastguard Worker
9e96efe1ca
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27790489'] into 24Q3-release.
...
Change-Id: I5bf530e58bbfd030f36b442fc42f43bd6bcd91c1
2024-07-10 05:24:18 +00:00
Haijie Hong
3ecc4b93bb
Determine Spatial Audio AudioDeviceAttributes by BT profile state
...
Test: atest BluetoothDetailsSpatialAudioControllerTest
Bug: 341005211
Flag: com.android.settingslib.flags.enable_determining_spatial_audio_attributes_by_profile
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4296b30dcf879701a9bf614b37b45d5f1d886fe4 )
Merged-In: I1436019d239414c3855d506dcf35d736c8428e0a
Change-Id: I1436019d239414c3855d506dcf35d736c8428e0a
2024-07-10 05:15:33 +00:00
Matías Hernández
3cd8fc86e1
Add "rename" option to 3-dot menu
...
(And remove the segmented buttons).
Fixes: 346278854
Test: manual
Flag: android.app.modes_ui
Change-Id: I6d45ba91cc400e5f3f01245c315cc5f0322c3bb1
2024-07-10 00:44:32 +00:00
Treehugger Robot
3e365cdc5f
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-09 22:10:16 +00:00
Riley Jones
d902bdbb62
Merge "Refactoring Accessibility settings to use ShortcutConstants.UserShortcutType" into main
2024-07-09 20:59:30 +00:00
Automerger Merge Worker
4b027e6ebf
Merge changes from topic "am-04e1c042090b48509e2682b5fa012fbf" into main
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 8499f60001
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb46b1dc9c
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 19edd63f45
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86a87925f6
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: edc6ee27c2
-s ours
2024-07-09 20:09:43 +00:00
Treehugger Robot
6acaa589af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 8499f60001
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210364
Change-Id: Ia8018f620ec8e997fdc290e6fd6de591e7ed00bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:09:13 +00:00
Bill Yi
d212cbcb76
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb46b1dc9c
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210364
Change-Id: I7ac7bad0e4ef2f48dcf602119c426ddaa9eebb2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:09:08 +00:00
Treehugger Robot
73e7ef15d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 19edd63f45
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210265
Change-Id: I975635f963db510f7e739cc572bda10eb5a3b567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:09:04 +00:00
Treehugger Robot
1380a1902d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 1dbe396041
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210362
Change-Id: Ib43d8abaca48264804888ccea59423052450497f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:09:03 +00:00
Bill Yi
e82b3fc4c8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86a87925f6
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210265
Change-Id: I3e65ca31cd35a867936bed3c46dbca9a70f2120d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:08:54 +00:00
Bill Yi
d87f6e805f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ccebfb91db
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210362
Change-Id: I54bf2e3d6fa4ea7d0eeb2c2c6c552cb407d42509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:08:51 +00:00
Bill Yi
e22ee4ed09
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: edc6ee27c2
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210263
Change-Id: I1bd28fd555677ca74fe795a1085dfd42b895685b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:08:44 +00:00
Bill Yi
04806523b9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d769e1a8d7
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28210361
Change-Id: I6fba407df34e611b6eb76614a12c1df86ce2f057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 20:07:34 +00:00
Treehugger Robot
8499f60001
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-09 19:50:29 +00:00
Treehugger Robot
19edd63f45
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-09 19:50:29 +00:00
Treehugger Robot
1dbe396041
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-07-09 19:50:16 +00:00
Treehugger Robot
e2bad9251a
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-09 19:32:21 +00:00
Treehugger Robot
b108711a81
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-09 19:32:21 +00:00
Treehugger Robot
9b513c37e4
Merge "Repost PageAgnostic mode notification when dismissed" into main am: 9a492ca3cb
am: f7486fc4a5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160058
Change-Id: Iac64aee8edc5948efc8ba9b8191c2604befbcfbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 17:56:25 +00:00
Treehugger Robot
f7486fc4a5
Merge "Repost PageAgnostic mode notification when dismissed" into main am: 9a492ca3cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160058
Change-Id: Ia7ae95a0988aa1e63669af5485ca25ef31993c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 17:40:34 +00:00
josephpv
20758d5cfe
Fix RTL alignment issue in private space education
...
With this change the RTL mirroring issue is fixed in the private space
education screen where the icons are aligned to the right for languages
requiring mirror support.
Screenshot:
go/ss/7AuF2HYsmTVaW5w.png
go/ss/HazpLiDH92X2X26.png
go/ss/4TueVkQcKmKZrAL.png
Flag: EXEMPT resource only update
Bug: 351141472
Test: Manual
Change-Id: I33d30ad425ae17e7a8653bc6545f640ee5d09706
2024-07-09 17:33:35 +00:00
Treehugger Robot
9a492ca3cb
Merge "Repost PageAgnostic mode notification when dismissed" into main
2024-07-09 17:27:16 +00:00
Julia Reynolds
f9ce78e87b
Merge "Create a new link preference for priority modes entry" into main
2024-07-09 13:17:06 +00:00
Treehugger Robot
b519dc9f32
Merge "Fix display problem in the freeform mode" into main
2024-07-09 13:08:55 +00:00
Treehugger Robot
fbfacbb9e5
Merge "FRP bypass defense in App battery usage page" into main
2024-07-09 11:46:46 +00:00
Zoey Chen
f7b2f0a19c
Merge "[Settings] Add pref key for metrics" into main
2024-07-09 11:43:42 +00:00
Alina Zaidi
9233fe7b46
Merge "[Dev option] Use DesktopModeStatus and ToggleOverride from wm/shell in Settings DesktopModePreferenceController" into main
2024-07-09 10:04:13 +00:00
Haijie Hong
2e3d477a3f
Merge "Add ring indicator for battery level" into main
2024-07-09 08:44:48 +00:00
Yiling Chuang
419a6a9079
FRP bypass defense in App battery usage page
...
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.
Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix
Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
2024-07-09 08:13:49 +00:00
Zoey Chen
21a54d0343
[Settings] Add pref key for metrics
...
Bug: 349749793
Test: manual
Flag: EXEMPT resource only update
Change-Id: I367a42d023b2a1b879130e63205e3f63365a4a86
2024-07-09 06:38:10 +00:00
Android Build Coastguard Worker
a679588159
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28146460'] into 24Q3-release.
...
Change-Id: If94fd151774f307d0b5fd23337bad4c46bc25d13
2024-07-09 03:01:37 +00:00
Rubin Xu
532aef2d0e
Fix certificate manager UI (take 2)
...
Change layout height so it does not obscure the floating
action buttons at the bottom.
Bug: 349518143
Flag: EXEMPT bug fix
Test: manual CTS Verifier run
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0922f282d8a0eb8ec818323485ea2bdb196c8185 )
Merged-In: Iaf82b2e6343790bbed9508a5dae9a66566760cac
Change-Id: Iaf82b2e6343790bbed9508a5dae9a66566760cac
2024-07-09 02:41:45 +00:00