Commit Graph

141412 Commits

Author SHA1 Message Date
Chris Antol
f8ddb510c7 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-dev am: 4299012bf3 -s ours am: bf1984a4e9 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737528

Change-Id: I46a349985a71dbbfaae11d55b63ffc7fe8790cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:58 +00:00
Chris Antol
8510e4a5cd [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: c02f4ee193 -s ours am: 6f9e9a7f0d -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737528

Change-Id: I413d2846b15cd60e8c7399e969ce17211c3ab506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:50 +00:00
Chris Antol
f9a9383511 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: 26818cc553 -s ours am: 060b6cffd0 -s ours am: 0c510a1283 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: Idb8ad5a800f703db98d2b701067bfeb76cf28d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:34 +00:00
Chris Antol
34cb87df33 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 0c1eda54b8 -s ours am: f64a344656 -s ours am: 7744478821 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I6824bd73eefdb5ffddb400cae8a5537f31cd76ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:28 +00:00
Chris Antol
bf1984a4e9 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-dev am: 4299012bf3 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737528

Change-Id: I3b07883c611718bae54aa34ca6486f1fc1050081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:13:02 +00:00
Chris Antol
6f9e9a7f0d [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: c02f4ee193 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737528

Change-Id: Ifa560dcd8fe269a0dec1dd5473c9efc5f1e98a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:56 +00:00
Chris Antol
0c510a1283 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: 26818cc553 -s ours am: 060b6cffd0 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I31bd2139d47bfb434c23ab7ff7c276f26747e84f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:14 +00:00
Chris Antol
7744478821 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 0c1eda54b8 -s ours am: f64a344656 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I17fa8e1b57893ad3e2ea07f510c9649a1872b350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:12:11 +00:00
Chris Antol
4299012bf3 Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-dev 2024-06-24 20:08:06 +00:00
Chris Antol
060b6cffd0 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: 26818cc553 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: Ie635d361b4bca98bbda72d5624449532c60e797c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:53:40 +00:00
Chris Antol
f64a344656 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 0c1eda54b8 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I9e362327df6a7b163ceb255b959b5d8cc57e5bca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:53:32 +00:00
Chris Antol
26818cc553 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I5d56d48fe08ad7d77c7611c5ed8fd665e738d2b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:32:22 +00:00
Chris Antol
0c1eda54b8 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I2bef35e37e21fb7fc1ab144bee1f448ff76c0a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:32:19 +00:00
Yuri Lin
84dd202d09 Merge "Add "delete mode" option on mode configuration page" into main 2024-06-24 19:30:47 +00:00
Chris Antol
63c74b58a0 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: Ic412acf8f15af4d3f0abc0242edded5a17f57f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:20:09 +00:00
Chris Antol
0621f87f2c [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I56cfaf769eae9492072e2c4fcd3e9d8c4ac17213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:20:02 +00:00
Chris Antol
49877d4d16 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I5b135fae2920550fcfe3fe511c0b51ba2342ff86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:02:40 +00:00
Chris Antol
b83437b203 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I4845864eb5c4eb981f4c953468c9d4e03acbb017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:02:30 +00:00
Chris Antol
f158052ead Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: If9375e24f43af2c0767eb8fe9d884af92f227fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 18:44:14 +00:00
Chris Antol
09f1d4c06b RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I269189a46b4c311bb8ff34e45d8d341bec54d7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 18:44:11 +00:00
Treehugger Robot
add6f2d24f Merge "Opt out of predictive back for biometrics" into main 2024-06-24 18:26:23 +00:00
Chris Antol
768eef96cf Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev 2024-06-24 18:24:09 +00:00
Yuri Lin
eb7285170b Add "delete mode" option on mode configuration page
Flag: android.app.modes_ui
Bug: 346575126
Test: manual
Change-Id: I0d085eb54ef5fa07f312bdddf0219855bf1c2ef4
2024-06-24 14:16:47 -04:00
YK Hung
cdb50d66e5 Merge "Public processAndSortEntries API for battery reattribution work" into main 2024-06-24 14:06:32 +00:00
Matías Hernández
bcc608fbb2 Style priority modes items in aggregator
* Different color if active.
* Trigger description / "ON" / "Paused" / "Tap to set up" depending on enabled and active status (strings may be revised later).

This CL also adds a helper class to create ZenModes, reducing boilerplate in unit tests.

Bug: 346575288
Test: atest com.android.settings.notification.modes
Flag: android.app.modes_ui
Change-Id: Ia0e16b8be5284d13bed4366cbee0f92748bf2f85
2024-06-24 11:56:11 +02:00
Chelsea Hao
3cac411486 Merge changes I9036e560,Ieb735d39,Ia78b1fe1,I91d9a45a into main
* changes:
  [Audiosharing] Created test for the name and password preferences.
  [Audiosharing] Created test for the main controller.
  [Audiosharing] Listen to `onProfileConnectionStateChanged` of LE_AUDIO_BROADCAST_ASSISTANT to be more precise on device connection status upon bluetooth on/off. Also increase test coverage.
  [Audiosharing] Increase test coverage for audio stream states.
2024-06-24 08:02:55 +00:00
chelseahao
4afef7eed1 [Audiosharing] Created test for the name and password preferences.
Test: atest -c com.android.settings.connecteddevice.audiosharing
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Bug: 345686602
Change-Id: I9036e560e29aba9555c207dce1b2018be010bca8
2024-06-24 14:36:08 +08:00
YK Hung
c16e835884 Public processAndSortEntries API for battery reattribution work
Bug: 346706894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: I09429eac563016a0a709b73ee4feab761ffe47dd
2024-06-24 05:55:42 +00:00
Chaohui Wang
0bd8a5d232 Merge "Use wifiCallingReadyFlow in WifiCallingSettingsForSub" into main 2024-06-24 02:09:16 +00:00
Chaohui Wang
f1d17b00ce [automerger skipped] Use old getSelectableSubscriptionInfoList am: f1b3c2b9c9 -s ours
am skip reason: Merged-In I06b6c61304f9e6c9515b5f989294417ac3f82a60 with SHA-1 ec8ce02ba4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27904527

Change-Id: Ib44a6e7a9703ec1b05219306da424814a7796b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 01:34:32 +00:00
Ioana Alexandru
b67c157e2f Merge "Move ZenModesBackend to SettingsLib." into main 2024-06-21 16:50:27 +00:00
Chaohui Wang
4d8c8faa9e Merge "Clean up unused fields from MobileNetworkRepository" into main 2024-06-21 13:25:46 +00:00
Ioana Alexandru
b1dad7d5b4 Move ZenModesBackend to SettingsLib.
This will allow us to access it from SystemUI.

Bug: 346519570
Test: builds
Flag: EXEMPT trivial refactor
Change-Id: I5bc480bd4eb0cbf8a26989dd11c064e66e5ee70e
2024-06-21 15:19:11 +02:00
Julia Reynolds
92024e1afc Merge "Migrate Settings intents" into main 2024-06-21 13:06:10 +00:00
Chaohui Wang
84c49b9fe6 Merge changes from topic "RoamingPreferenceController" into main
* changes:
  Fix crash in RoamingPreferenceController
  New CarrierConfigRepository
2024-06-21 08:55:56 +00:00
Chaohui Wang
562f56bb7a Use wifiCallingReadyFlow in WifiCallingSettingsForSub
Simply and unify the logic, and fixed a crash.

Fix: 348372605
Flag: EXEMPT bug fix
Test: manual on Wi-Fi calling
Change-Id: Idc7dff934323fbebb09137bbd0585575e65a7867
2024-06-21 16:53:38 +08:00
YK Hung
0a2d60a9c5 Merge "Update the database filename and the version number as the same time" into main 2024-06-21 08:38:19 +00:00
YK Hung
871b2b7a85 Update the database filename and the version number as the same time
Fix: 348156270
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: I26d7e1bf0d1766374359b6c6f12e96d78726ed85
2024-06-21 07:12:46 +00:00
chelseahao
e0abdc5c7a [Audiosharing] Created test for the main controller.
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Bug: 345686602
Change-Id: Ieb735d392607c131c213be90cd72c4b7a9ed958d
2024-06-21 14:34:39 +08:00
chelseahao
44a0b59ad2 [Audiosharing] Listen to onProfileConnectionStateChanged of LE_AUDIO_BROADCAST_ASSISTANT to be more precise on device connection status upon bluetooth on/off. Also increase test coverage.
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Bug: 345686602
Change-Id: Ia78b1fe19bff3cb179794db1dc09374db13818d8
2024-06-21 14:14:45 +08:00
Edgar Wang
a1acf685d0 Change the text of the search bar in Homepage screen
Bug: 348069291
Change-Id: I35771e9a347715819e65e0d86f1cd38eaa5618ae
Test: visual
Flag: com.android.settings.flags.homepage_revamp
2024-06-21 04:51:11 +00:00
Chaohui Wang
cfd401b04e Fix crash in RoamingPreferenceController
With new MobileDataRepository.isDataRoamingEnabledFlow() to provide
the data instead of MobileNetworkRepository.

Fix: 347224962
Flag: EXEMPT bug fix
Test: manual on Mobile Settings
Test: unit test
Change-Id: I2a994cb11c93296fb46558f566d6d4467ba4c846
2024-06-21 04:39:44 +00:00
Chaohui Wang
ef12f1ddb5 New CarrierConfigRepository
Benefices,
- Gets the configuration values of the specified keys, for better
  performance
- Check key suffix for correctness
- Support cache
- If CarrierConfigManager throw exception, use default value

Bug: 337417520
Flag: EXEMPT refactor
Test: manual on Sim Status
Test: unit
Change-Id: I68f41ef66d495080f628794ade63cf807efba619
2024-06-21 04:39:24 +00:00
Edgar Wang
1430348455 Merge "[Homepage revamp] Adjust the padding of Search bar in the homepage container." into main 2024-06-21 03:53:27 +00:00
Chris Antol
253f1ad392 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours am: fcc9252a67 -s ours am: e7cf908cb4 -s ours am: 1dcd330a0c -s ours am: cabba8bdb7 -s ours am: 13a3cbda4c -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676296

Change-Id: I32a357cb673b3b16976fe60ced4c1b32541ee032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:50:31 +00:00
Chris Antol
5eb8525951 [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours am: bb9e14f93d -s ours am: 7ebdef372b -s ours am: aef507959d -s ours am: 541d30726d -s ours am: 526993a145 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676296

Change-Id: I3f66745160ec79199e0047d219ec1e643c35296f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:50:26 +00:00
Automerger Merge Worker
e2c6984b56 [automerger skipped] Merge changes from topic "am-beae6d45c4f54e539026901c293ffe26" into udc-dev am: 6faee05799 -s ours am: c44af23307 -s ours am: b1608c3288 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675441

Change-Id: I2a2725bd951bf65a987179506e82fe79d167adda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:50:08 +00:00
Chris Antol
532b71b3a6 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours am: 43dd6d2c82 -s ours am: 332aca2baa -s ours am: ef3b4ee860 -s ours am: 5255f8f343 -s ours am: dd0f1fb5fd -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675441

Change-Id: I61e9f9eb4c7dfb2ab142da8e9fcb79f292f1eb65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:50:03 +00:00
Automerger Merge Worker
5809a84780 [automerger skipped] Merge changes from topic "am-7c932fc208fa4104bc73a89be5614517" into udc-dev am: 167fa8f063 -s ours am: f0025ba095 -s ours am: 512aad713b -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676296

Change-Id: I7fed0a02c2f27dcb765a980cc92c989388f8b999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:49:45 +00:00
Chris Antol
1c0c350edc [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours am: ef1fb71944 -s ours am: 678597cc3d -s ours am: 9b1dd5f839 -s ours am: d2d57524e7 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676296

Change-Id: If5da3f13fd9a69eb2e18343eaa180d12e57ec81c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 03:49:41 +00:00