Chris Antol
5bdcb7bae7
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b
-s ours am: ce0820929a
-s ours am: 64fb2b4168
-s ours am: bafba4df6f
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: I6ee6d6a83ea7fa960e15ed9421c0d0f10d1eac57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:19:35 +00:00
Chris Antol
70906b163a
[automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a
-s ours am: 5691154dbb
-s ours am: a77217943b
-s ours am: d4d25bf811
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: I7bee2bf3570b577327b0b61f2340ac1fd93ab066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:19:29 +00:00
Automerger Merge Worker
4d6ec14c80
Merge "Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51
am: 4b73fbdb8e
am: 9891ce6e7f" into main
2024-06-21 02:19:24 +00:00
Automerger Merge Worker
9a2d4d233b
Merge changes from topic "am-10ffa8e8305d4d019a219ab9a33932df" into main
...
* changes:
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b
-s ours am: ce0820929a
-s ours am: 6c03aeba9c
-s ours
[automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a
-s ours am: 5691154dbb
-s ours am: a65a820d87
-s ours
2024-06-21 02:19:21 +00:00
Chris Antol
ef036de735
Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51
am: 4b73fbdb8e
am: 9891ce6e7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675438
Change-Id: I5811fef27cecfafbd9badafd60434f3abf59d198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:19:13 +00:00
Chris Antol
fe519cf503
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b
-s ours am: ce0820929a
-s ours am: 6c03aeba9c
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: I26e6441db7f88c01421cee8fd007d274c8232fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:19:07 +00:00
Chris Antol
bafba4df6f
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b
-s ours am: ce0820929a
-s ours am: 64fb2b4168
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: Iaeafd2c4b2dc0bd0fe9ed88fa3c85cc4c5b4bcdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:18:59 +00:00
Chris Antol
e280464e25
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into udc-qpr-dev am: 07da5ed640
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676182
Change-Id: Id34c4f613681ed0d2c01101c8f6135ae54788c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:18:59 +00:00
Chris Antol
4cc45f185f
[automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a
-s ours am: 5691154dbb
-s ours am: a65a820d87
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: I3281f7cc032372826b0dc3ecb96f43a6efab6902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:18:59 +00:00
Chris Antol
d4d25bf811
[automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a
-s ours am: 5691154dbb
-s ours am: a77217943b
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: Ic0633ace415f0a792d9252f4d4e0f3cd64d4dd41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:18:54 +00:00
Chris Antol
37b28d8d58
[automerger skipped] Ignore fragment attr from ext authenticator resource am: 8607f3a34e
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676182
Change-Id: I9c8884b42e663623f0b4c77b4071af3a76611a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:18:54 +00:00
Chris Antol
9891ce6e7f
Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51
am: 4b73fbdb8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675438
Change-Id: I9543e8aece37c81f65b6e84ef13fdbb4463ec8d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:18:42 +00:00
Chris Antol
a09dec69be
Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51
am: 5f9fdfe17e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675438
Change-Id: Ic98bd29c665dbc63d68ae81560d7cbc6f081643c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:18:05 +00:00
Chris Antol
6c03aeba9c
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b
-s ours am: ce0820929a
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: I6b68efac561d877ee58ff37f41b7919b9faa37a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:03:25 +00:00
Chris Antol
a65a820d87
[automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a
-s ours am: 5691154dbb
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: I5c46e21c4ea8be48e668086d9d4292a3af0ed437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:03:22 +00:00
Chris Antol
64fb2b4168
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b
-s ours am: ce0820929a
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: I47c97dacf96c21ab48d1b3d2047e87d2a0744a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:03:03 +00:00
Chris Antol
a77217943b
[automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a
-s ours am: 5691154dbb
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: I25669252c7b2a6488c8031ef5d130b3ac4dd97f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 02:02:57 +00:00
Chris Antol
07da5ed640
Merge "Ignore fragment attr from ext authenticator resource" into udc-qpr-dev
2024-06-21 01:56:46 +00:00
Chris Antol
ce0820929a
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev am: d8a7ed649b
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: I6400c6e725af571d9d947a8370a580ffc16da130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:55:58 +00:00
Chris Antol
4b73fbdb8e
Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675438
Change-Id: I4dbdf1e36fc580ac00f812d904bca9ad1c31ae1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:55:42 +00:00
Chris Antol
5f9fdfe17e
Merge "Ignore fragment attr from ext authenticator resource" into udc-dev am: 79ab22ba51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675438
Change-Id: I2a0b681684c98a69ee5e0ad062ffcd7c53f496dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:55:42 +00:00
Chris Antol
5691154dbb
[automerger skipped] Ignore fragment attr from ext authenticator resource am: f5e9b0167a
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675439
Change-Id: I67bccdf9d45b2d3a9bf1fcb62128b67ea6f6131a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:55:39 +00:00
Chris Antol
79ab22ba51
Merge "Ignore fragment attr from ext authenticator resource" into udc-dev
2024-06-21 01:29:41 +00:00
Chris Antol
d8a7ed649b
Merge "Ignore fragment attr from ext authenticator resource" into tm-qpr-dev
2024-06-21 01:29:10 +00:00
Treehugger Robot
dfc29ef6e1
Merge "Don't show the QuickSetting tooltip when we stopped auto add qs tile for the user" into main
2024-06-21 00:50:46 +00:00
Chun-Ku Lin
764f8d73a4
Don't show the QuickSetting tooltip when we stopped auto add qs tile for
...
the user
Bug: 348110750
Test: atest ReduceBrightColorsPreferenceControllerTest
Test: manual
- Go to Settings > Accessibility
- Turn on Extra dim for the first time
- Verify the QS tooltip prompt doesn't show up
Flag: android.view.accessibility.a11y_qs_shortcut
Change-Id: I6fecb818df3bb865ba81cbcda94149a98d8255ab
2024-06-20 23:36:03 +00:00
Xin Li
b14a7842b1
[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 300b455081
-s ours
...
am skip reason: Merged-In Iebec11afc62ecb79386e1866af57cd4e68461a95 with SHA-1 41902bb0c5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27908824
Change-Id: Ibbfbedcf2e219fc43005ac89840634590b0446ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 21:46:17 +00:00
YK Hung
df43d049d4
Merge "Load and process the battery reattribute data in the periodic job (3/5)" into main
2024-06-20 16:28:03 +00:00
Julia Reynolds
3b62c23310
Design refresh for modes that don't filter notifications
...
And fix a crash noticed in ZenModeAppsLinkPreferenceController
Test: atest com/android/settings/notification/modes
Fixes: 308820027
Flag: android.app.modes_ui
Change-Id: I0cfe4e10ca7ff97dac3b3b8756cc36f4d6f91ea2
2024-06-20 13:10:36 +00:00
Haijie Hong
78a0662272
Merge "Determine Spatial Audio AudioDeviceAttributes by BT profile state" into main
2024-06-20 12:16:54 +00:00
Treehugger Robot
45c36458ca
Merge "Fix edge-to-edge issue in certificate manager UI" into main
2024-06-20 11:29:45 +00:00
YK Hung
98319ac0f5
Load and process the battery reattribute data in the periodic job (3/5)
...
Bug: 346706894
Fix: 348156270
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: Ibaa1d9d960aa6a885307fbb3dd3a62aaeb32de23
2024-06-20 11:20:16 +00:00
Tetiana Meronyk
826b188119
Merge "Fix tests in UserDetailsSettingsTest and TimeoutToDockUserPreferenceControllerTest" into main
2024-06-20 10:34:18 +00:00
Rubin Xu
c7eded46e1
Fix edge-to-edge issue in certificate manager UI
...
Bug: 348083996
Flag: EXEMPT bugfix
Test: maunally start the certificate manager UI via TestDPC
Change-Id: Id92897c81087febfdf02c8b90d69cd3e4270a22c
2024-06-20 10:27:34 +00:00
Chaohui Wang
ec59cd0c8b
Move mobile data logic into MobileDataRepository
...
Bug: 347224962
Flag: EXEMPT refactor
Test: manual on Mobile Settings
Test: unit
Change-Id: I2b54f9e6c4addafd31d7d96f2a44870cd54fe185
2024-06-20 11:49:06 +08:00
Tetiana Meronyk
c502ee4540
Fix tests in UserDetailsSettingsTest and TimeoutToDockUserPreferenceControllerTest
...
Bug: 313530297
Test: atest UserDetailsSettingsTest && atest TimeoutToDockUserPreferenceControllerTest
Flag: EXEMPT fixing tests that were failing before
Change-Id: Ic4bd257aa26c6627d271acd1f22b59855bbddb20
2024-06-19 21:09:55 +00:00
Matías Hernández
2345b63c68
Merge "Support adding an automatic schedule to previously-manual system-owned modes" into main
2024-06-19 16:16:07 +00:00
Rambo Wang
700fff1eb7
Merge "Fix Settings restart during Reset mobile nework settings flow" into main
2024-06-19 14:41:46 +00:00
Rambo Wang
5ac9d9c8fa
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
Change-Id: I7bfa79bc9d7451a4a03269704b0009a3730e287f
2024-06-19 14:41:19 +00:00
Matías Hernández
0bf4899f3e
Support adding an automatic schedule to previously-manual system-owned modes
...
Bug: 342156843
Bug: 326442408
Flag: android.app.modes_ui
Test: atest com.android.settings.notification.modes
Change-Id: Ib7d15b8fc949fa73015537f03a882ef7eb6b4bcd
2024-06-19 15:06:08 +02:00
Kai Zhou
a6c54bc98f
Merge "Retrieve WifiDppQrGeneratorFragment at runtime." into main
2024-06-19 06:56:42 +00:00
Chaohui Wang
107f7a7a83
Merge "Refactor PrintSettings (2/n)" into main
2024-06-19 06:27:48 +00:00
Chaohui Wang
03ccaf8b9d
Merge "Refactor ApnEditCarrierEnabled" into main
2024-06-19 05:21:24 +00:00
Chelsea Hao
e626a77a81
Merge "[Audiosharing] Add log for debugging." into main
2024-06-19 02:42:55 +00:00
chelseahao
89df32b48c
[Audiosharing] Add log for debugging.
...
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 347605485
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Change-Id: I319747652837c08ffcbbd5980609a0f8f35e3c24
2024-06-19 02:42:37 +00:00
YK Hung
bf38bed803
Merge "Dump the BatteryReattribute from the database into bugreport (2/5)" into main
2024-06-19 02:29:31 +00:00
Chaohui Wang
71331802ef
Refactor ApnEditCarrierEnabled
...
Also fix tests.
Bug: 342374681
Flag: EXEMPT refactor
Test: manual - on Apn Edit
Test: unit test
Change-Id: I6db7f27a26341084940be4f8039f5097faa07ec8
2024-06-19 02:19:29 +00:00
Xin Li
300b455081
Merge 24Q3 (ab/11976889) to aosp-main-future
...
Bug: 347831320
Merged-In: Iebec11afc62ecb79386e1866af57cd4e68461a95
Change-Id: Ia81f1e4efd5fc15bfbdace86b53e4cbf49f2022e
2024-06-18 14:13:44 -07:00
YK Hung
d226a97617
Dump the BatteryReattribute from the database into bugreport (2/5)
...
Example:
BatteryReattributeEntity{
Jun 18, 2024, 16:22:51
Jun 18, 2024, 16:23:01
reattribute_data {
key: 1001
value: 0.1
}
reattribute_data {
key: 1002
value: 0.99
}
timestamp_end: 1718727781368
timestamp_start: 1718727771368
}
BatteryReattributeEntity{
Jun 18, 2024, 16:22:31
Jun 18, 2024, 16:22:51
reattribute_data {
key: 1003
value: 1.0
}
timestamp_end: 1718727771368
timestamp_start: 1718727751368
}
Bug: 346706894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage.bugreport
Flag: EXEMPT bug fix
Change-Id: Ie2544b9f43e399d87eb29354b401834372c3a9f7
2024-06-18 16:37:55 +00:00
J. Eason
411d5c15d3
Merge "Update the icon for the adb wireless pairing code preference." into main am: 2c4ceb385f
am: 2ff1438553
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3133784
Change-Id: Iebb2c61faa82309d5e54e6c039c1b00ca6c0f7d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-18 14:44:09 +00:00