Chris Antol
6cece47720
[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: Ib53ed62c880185ae978f3f0e2b0b2507b70bb0ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:12:39 +00:00
Chris Antol
b372cb5fed
[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: Icf6f53222b0c6e384a45fa4cfcff1c9417e7fdd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:12:35 +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
dae2288946
[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: c5faf1d79a
-s ours am: 7205bcad28
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530
Change-Id: Id51edd329e377127ae0d350b1d1b6519c61b155e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:12:03 +00:00
Chris Antol
3112d0509e
[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: 676e3e72ea
-s ours am: 40e725fa69
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530
Change-Id: I514759ba146dbf2c7a9fe4af1cf183a979ef1ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:11:57 +00:00
Chris Antol
44a17aed24
[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: I4eb56c391bf0da0d3ce937bc7173f8d2f2b6879c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:11:49 +00:00
Chris Antol
786a98aa51
[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: Iaaf3357647639f0d45bfb3e1fe360636286d77be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 20:11:45 +00:00
Chris Antol
7fed195ad9
Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev
2024-06-24 20:08:15 +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
38c2736f24
Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-qpr-dev
2024-06-24 20:07:57 +00:00
Chris Antol
cafa795b76
Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into udc-qpr-dev
2024-06-24 20:07:47 +00:00
Chris Antol
477f4f21f0
Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev
2024-06-24 20:07:36 +00:00
Chris Antol
c18be19b10
Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev
2024-06-24 20:07:23 +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
7205bcad28
[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: c5faf1d79a
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530
Change-Id: I3a96607465af20b65588a7b5cdb3ba76fdba312b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 19:52:03 +00:00
Chris Antol
40e725fa69
[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: 676e3e72ea
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530
Change-Id: Ia2a6490e786dfd981b5631a663328340fb91fed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 19:51:56 +00:00
Chris Antol
c5faf1d79a
[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: I554aa339ba36871b3278e4bde47e9e0b96e58499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 19:32:31 +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
676e3e72ea
[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: I610bfcbc8fa7443b8bf58c059c4601987b5598e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 19:32:21 +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
tomhsu
f60b42acad
When received Carrier Config Change, refresh UI.
...
Flag: EXEMPT bug fix
Fix: 340890663
Test: Manual test
Change-Id: Ia78c2dfb7e567161bcbb8d1d622cdccb178778e0
2024-06-24 13:04:18 +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