Commit Graph

22354 Commits

Author SHA1 Message Date
Jihoon Kang
4ae6ead8d6 Make java_sdk_library dependencies explicit
modules should specify the submodule of java_sdk_library that the module
actually depends on

Test: CI
Bug: 358613520
Merged-In: I78dec317d4e74275287e3a5b7f5ffe2b10db05ab
Change-Id: I78dec317d4e74275287e3a5b7f5ffe2b10db05ab
2024-09-10 22:43:05 +00:00
Treehugger Robot
96fcc4903b Merge "bluetooth: Refactor BT Audio Codec list" into main am: 7c9f1454da
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3241342

Change-Id: I87e97131d3361224aa898838bf6c04308d95bd28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 07:23:17 +00:00
Jakub Rotkiewicz
97b113a660 bluetooth: Refactor BT Audio Codec list
* Show only selectable codecs to the user
* Removed redundant 'abstract' layer
* Disable codec selection when BluetoothA2dp, active device unavailable
  or HD Audio disabled.

Bug: 329809288
Bug: 346490998
Flag: EXEMPT - refactor
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.BluetoothCodecListPreferenceControllerTest
Merged-In: I56ebfeaf2cfa22ec253db897d7b7e96d1f8eee61
Change-Id: I23714715d9257479f5eac1a172ba1804da7e64e3
2024-08-27 20:15:01 +00:00
Treehugger Robot
05422458fe Merge "Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future" into aosp-main-future 2024-08-15 16:58:27 +00:00
Xin Li
0b886fe303 Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future
Bug: 347831320
Merged-In: I54a12b03ed9be6dc49fb957df0f1f7b31647810d
Change-Id: I473577d5983daafb368afa5523bad948499cb9a2
2024-08-14 23:26:30 -07:00
Haijie Hong
61a2efc807 Merge "Add owners for bluetooth settings test folder" into main am: 55834fff02
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3216259

Change-Id: I4835d1b33e1593892054224dec33ea79e64187dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 10:32:20 +00:00
Haijie Hong
6f38de4932 Add owners for bluetooth settings test folder
Change-Id: I1503db974eb271890486581d173c1bde8457f7df
2024-08-14 09:42:21 +00:00
Xin Li
20fb15ea4b Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future 2024-08-12 17:14:32 +00:00
Treehugger Robot
d005b3250b Merge "Fix DoubleBraceInitialization errorprone issues" into main am: 05c4027843
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3214820

Change-Id: I5b364535808594161ae0aa7fe6d2eb75149fdd77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 23:31:01 +00:00
Treehugger Robot
05c4027843 Merge "Fix DoubleBraceInitialization errorprone issues" into main 2024-08-09 23:12:10 +00:00
Cole Faust
2483b32069 Fix DoubleBraceInitialization errorprone issues
https://errorprone.info/bugpattern/DoubleBraceInitialization

Flag: EXEMPT refactor
Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Idf52035a720f051a43553b53a89a37131d4e208b
2024-08-09 15:05:14 -07:00
Chaohui Wang
6d09b136d5 Merge "Reduce flaky of AppNotificationPreferenceTest" into main am: 422770ed1e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3212002

Change-Id: If04a3e903a7fd151dd07004eba283f41df044ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 06:55:52 +00:00
Chaohui Wang
7380359520 Reduce flaky of AppNotificationPreferenceTest
Bug: 355413226
Flag: EXEMPT test only
Test: atest AppNotificationPreferenceTest
Change-Id: I1dfe4c5ae764941acb78e8fad52518963d1dad74
2024-08-09 05:33:27 +00:00
Xin Li
e2d326beeb Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
Bug: 347831320
Merged-In: I2489a64804f068a957f9be3f87847d6911b24447
Change-Id: I1885ef34f69ac4eb6e76ac903fcacdebe4139ae1
2024-08-08 11:41:20 -07:00
Les Lee
ae2195c549 wifi: fix ADB URI doesn't work
Using old WifiQrCode parsing for ADB Uri.

Flag: EXEMPT bugfix
Bug: 355088188
Test: Manual test & TH
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:da21128568e29a6c2992b1b38cbb2db9ec36892f)
Merged-In: I54a12b03ed9be6dc49fb957df0f1f7b31647810d
Change-Id: I54a12b03ed9be6dc49fb957df0f1f7b31647810d
2024-07-29 23:56:20 +00:00
Treehugger Robot
ee6f5cf1ed Merge "Make adb team OWNERS of all Adb settings" into main am: 998787ffa8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3195878

Change-Id: Idcd085b62b69bace7ddfda325b1645b6b89440ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-26 18:25:24 +00:00
Fabien Sanglard
c7adef9634 Make adb team OWNERS of all Adb settings
Test: NA
Bug: 355088188
Flags: NA
Change-Id: I59c037765940a26509f1d312b4c8c2e0105a3580
2024-07-26 10:57:43 -07:00
Rambo Wang
a07738266b Fix Settings restart during Reset mobile nework settings flow
This CL avoids restarting Settings in the reset mobile flow when phone
process is restarted, by switching the usage of the stable content
provider connection to the unstable client.

The CL also arranges restarting phone process as the last reset
operation in the flow (later than RILD reset) to avoid any reset
operation get impacted by phone process restarting.

Since the permission to protect the TelephonyContentProvider has been
renamed, the CL also renames the requsted permision.

Bug: 347047105
Test: atest ResetNetworkOperationBuilderTest
Test: Reset mobile network feature test
Flag: EXEMPT resource update with minor refactoring
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ac9d9c8fa0005f787b75052010dcc9935efcb4f)
Merged-In: I7bfa79bc9d7451a4a03269704b0009a3730e287f
Change-Id: I7bfa79bc9d7451a4a03269704b0009a3730e287f
2024-07-26 02:03:55 +00:00
Ram Peri
119d1e9f43 Merge "Robolectric upgrade" into main am: 71b2be5571
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3185301

Change-Id: I9469f534e375c589f0a7dbac20f185f61ae69295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-23 01:08:54 +00:00
Ram Peri
f5b58ea3be Robolectric upgrade
Test: atest SystemUIGoogleRoboRNGTests
Flag: TEST_ONLY
Change-Id: I833ac67223875480994f947907754290bb25c946
2024-07-22 13:48:09 -04: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
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
Alina Zaidi
7b4fcc6006 Merge "Update OWNERS for DesktopModePreferenceController" into main am: ed9bccb0b3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3159736

Change-Id: I79c2dd015ce63fa0fe658daf486971f48917f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 17:37:22 +00:00
Alina Zaidi
a059eabdb3 Update OWNERS for DesktopModePreferenceController
Change-Id: I446525a06480a27f80e530c65181fd31f43a9ef8
Test: N/A
Flag: EXEMPT Ownership cannot be flagged
2024-07-03 16:22:23 +00:00
Pawan Wagh
fdd68f473b Merge "Fix flaky test for persistent notifications" into main am: b6fc7a6f58
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3156445

Change-Id: I0c2f3c0445e06e63a26cc69efa326c8ccabf0e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 15:36:52 +00:00
Pawan Wagh
b6fc7a6f58 Merge "Fix flaky test for persistent notifications" into main 2024-07-03 15:14:25 +00:00
SongFerng Wang
5462789fae Merge "Fix AppBatteryPreferenceTest flaky" into main 2024-07-03 09:34:52 +00:00
Pawan Wagh
999b8a9f33 Fix flaky test for persistent notifications
Persistent notifications test sometimes fails due
to setup activity doesn't exit due to failed intent.
Adding setup exit command when on device tests are starting and
adding timeout for transition.

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Bug: 349820489
Change-Id: Iaf1c1f481612367bbce919b27e89f88a24abb582
2024-07-02 23:57:57 +00:00
Chaohui Wang
6a6a263177 Fix AppBatteryPreferenceTest flaky
Bug: 350448913
Test: unit test
Merged-In: I5a1753835d2d47712ea249081c9a77c455eb3291
Change-Id: I5a1753835d2d47712ea249081c9a77c455eb3291
2024-07-02 23:28:49 +00:00
Joshua Mccloskey
08697a3b5c Revert "Restart fingerprint auth on cancel."
This reverts commit 4efd4c16f9.

Reason for revert: Breaks auth behavior

Fixes: 347858844
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16f973b8364171116ce16b951113d64beefe506c)
Merged-In: Ie1b8be9dfae2cba7e2b37187f08cf1360aedf29f
Change-Id: Ie1b8be9dfae2cba7e2b37187f08cf1360aedf29f
2024-06-27 03:45:41 +00:00
Chaohui Wang
ad93026e3b Fix Apn network type tests
Bug: 347114536
Test: unit test
Change-Id: Ib5bd331e9a28e89e426bf423e6086d1c2d288961
Merged-In: Ib5bd331e9a28e89e426bf423e6086d1c2d288961
(cherry picked from commit 288b40ee4f)
2024-06-21 01:52:18 +00:00
Chaohui Wang
e01855dcdb Fix SubscriptionInfoListViewModelTest
Fix: 329160337
Test: unit test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:10f5bdabb468b806d634a2b9061b9908b2e8d430)
Merged-In: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
Change-Id: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
2024-06-18 06:59:56 +00:00
Kevin Liu
76d7864bc6 Merge "Add strict_mode: false" into main 2024-06-18 03:07:47 +00:00
Yiyi Shen
9bd19f4604 Merge "[Audiosharing] Reset shadows after tests." into main 2024-06-16 13:24:13 +00:00
Yiyi Shen
440d061648 Merge "[Audiosharing] Increase audio sharing test coverage" into main 2024-06-16 13:21:38 +00:00
Alexander Roederer
be647ab053 Merge changes from topic "b308819928-ModesSettingsAppBreakthroughPage" into main
* changes:
  Modify Summary for Mode's Apps settings page
  Adds summary helper for apps subtitle
2024-06-16 02:49:53 +00:00
Alexander Roederer
41902bb0c5 Modify Summary for Mode's Apps settings page
Adds call to SummaryHelper to set Apps preference summary.

Bug: 308819928
Test: atest ZenModeAppsLinkPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: Iebec11afc62ecb79386e1866af57cd4e68461a95
2024-06-15 04:48:38 +00:00
Matías Hernández
8409c39d94 First bits of "add a mode"
* Preference below the modes list.
* Temporarily triggers addition of a mode with default name and type=SCHEDULE_TIME (type will be "manual only" later).
* Fixed sorting of modes in the list when refreshing (new modes were added at the bottom instead of where they should, the same would've happened for renamed modes).
* Minor polishes (extracted fragment launch to helper class, renamed item controller class for clarity).

Test: atest com.android.settings.notification.modes
Bug: 326442408
Fixes: 347198709
Flag: android.app.modes_ui
Change-Id: Ie276c92181c5374faf74592433595e7e15a5efc0
2024-06-14 15:23:30 +00:00
chelseahao
16f9205fb6 [Audiosharing] Add tests for qrcode related classes.
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: I74caacf43a23bbd0a6da44af24a1be4dd9544a5d
2024-06-14 11:38:51 +00:00
Chelsea Hao
24d8411915 Merge changes I6322ccbb,Idc96c23d into main
* changes:
  [Audiosharing] Add tests.
  [Audiosharing] Add logging 3.
2024-06-14 11:07:49 +00:00
Yiyi Shen
f570ee0018 [Audiosharing] Reset shadows after tests.
Test: atest
Bug: 345686602
Change-Id: I311ba5c8d234240e61dffd17b4357452c12f4fb1
2024-06-14 17:44:33 +08:00
Treehugger Robot
fbf3403f8d Merge "Reenable all tests for SettingsRoboTests" into main 2024-06-14 08:52:33 +00:00
chelseahao
f6b235746d [Audiosharing] Add tests.
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: I6322ccbb5deffe2bc169a898ef0208e135caa819
2024-06-14 08:48:17 +00:00
Matías Hernández
e3570eb633 Merge "Load zen mode type icon options from the proper resources" into main 2024-06-14 08:10:59 +00:00
Fan Wu
595ed9645e Reenable all tests for SettingsRoboTests
Updating tests in development/ due to ag/27774179
Temporarily ignore tests in UserDetailsSettingsTest due to ag/27785999

Bug: 347125800

Test: atest
Change-Id: Iaed79c3fde80f5b2c31754bef4a93546813444a8
2024-06-14 07:27:31 +00:00
Yiyi Shen
2c6b9bb364 [Audiosharing] Increase audio sharing test coverage
Bug: 345686602
Test: atest
Change-Id: Iec196fc884c3b7ddd580eb8dd13b445d59e3b1b7
2024-06-14 14:30:14 +08:00
Natnael Belay
10c4f84852 Merge "Temporarily ignore 2 ApnEdit tests" into main 2024-06-13 16:49:25 +00:00
Alexander Roederer
a6b1d7cbbc Adds summary helper for apps subtitle
The subtitle for the apps page says which apps (up to two/three) and how
many (if there are more than three) are allowed to bypass dnd under the
main "Apps" page.

Bug: 308819928
Test: atest ZenModesSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: I15696384c392ba3f054948db50eea614f91d8c48
2024-06-13 13:20:29 +00:00
Matías Hernández
22c325a099 Load zen mode type icon options from the proper resources
* Move default mode icons from Settings res to core res.
* Add array resources for the icon options and their descriptions.
* As the initial version of the list, use the default mode icons.

Bug: 333901673
Test: atest IconOptionsProviderImplTest
Flag: android.app.modes_ui
Change-Id: I66669e67a9d607268c05d5ed3df6c9555e57864c
2024-06-13 14:38:51 +02:00
Treehugger Robot
50ee61a80f Merge "InternetPreferenceController V2 (7/7)" into main 2024-06-13 10:05:19 +00:00