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
1a8d068be8
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440
Change-Id: I94d528dc3241926d72bdd795a7b27f5365f08645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:49:19 +00:00
Chris Antol
dd1692a16d
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440
Change-Id: I54aacf80026eda2fc70766a243e4ccfff216868f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:49:17 +00:00
Chris Antol
f3a110e707
[automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440
Change-Id: I3a8cee5ecf58f17876f2fa27e69582c4cd7ba01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:49:16 +00:00
Chris Antol
2d9969176b
[automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6
-s ours
...
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27675440
Change-Id: I3da5c4afe6754373d047f9e8a9fb186e16ec80c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:49:12 +00:00
Chris Antol
9e31e01946
Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185
am: b6e9e08ae3
am: 6b5d026668
am: 7a2e7aac88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295
Change-Id: I3d6fcf2ba1fc2765b4ba8d1a01dfba69289126e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:48:49 +00:00
Chris Antol
383cbae5a3
Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185
am: b6e9e08ae3
am: 6b5d026668
am: 7a2e7aac88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295
Change-Id: I70b72fa0ac4f7dd5db7ff02e3edba7867263c6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:48:44 +00:00
Chris Antol
0b4c1120ef
[automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01
-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: I4b96938a53fb36a9fd67b80c1da853fab5dff0be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:48:19 +00:00
Chris Antol
2d4f02e360
[automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350
-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: I5335d5bdc6f1bbcd86466864e96c757b5a757433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:48:15 +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
0c15f71ece
Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev
2024-06-21 01:29:23 +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
Chris Antol
4b073bf14c
Merge "Ignore fragment attr from ext authenticator resource" into tm-dev
2024-06-21 01:28:56 +00:00
Chris Antol
fce0c57c01
Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev
2024-06-21 01:28:22 +00:00
Chris Antol
7a2e7aac88
Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185
am: b6e9e08ae3
am: 6b5d026668
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295
Change-Id: I93a5ce93076055af691dc61cf7f2d32c45bd2fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 01:17:57 +00:00
Chris Antol
6b5d026668
Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185
am: b6e9e08ae3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295
Change-Id: I0d6b47560df6c7df5e9e56b6fd3336dcc63da78e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 00:55:00 +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
Chris Antol
b6e9e08ae3
Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295
Change-Id: I2a62051844b3296e49fb6941b36af02c93a95803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 00:35:21 +00:00
Chris Antol
c5031de185
Merge "Ignore fragment attr from ext authenticator resource" into sc-dev
2024-06-21 00:14:16 +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
Edgar Wang
57fa134ade
[Homepage revamp] Adjust the padding of Search bar in the homepage container.
...
Bug: 340773713
Test: visual
Flag: com.android.settings.flags.homepage_revamp
Change-Id: I3fc8a8f56ba8e8c401e907fbb45fc980eb335538
2024-06-20 17:21:32 +00:00
Julia Reynolds
dea5102c44
Migrate Settings intents
...
to our new modes ui
Fixes: 333909883
Test: manual - created test app that launches each intent, launched each
with flag on and flag off
Test: atest com.android.settings.notification.modes
Flag: android.app.modes_ui
Change-Id: I8259b554fe34b453880890c667165547033ccd06
2024-06-20 12:48:40 -04: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
f1b3c2b9c9
Use old getSelectableSubscriptionInfoList
...
24D1-dev was using the
SubscriptionUtil.getSelectableSubscriptionInfoList().
Change I215b5a4615a3b3da6fc160f76c85c814210cc3ef cherry-pick the new
getSelectableSubscriptionInfoList from main, but not the latest version,
could produce an unexpected subscription order.
Main branch already fixed by I06b6c61304f9e6c9515b5f989294417ac3f82a60
and If7150bd2fa5c1b7d42fe34ef2e814ba540454ed8.
Fix: 341037896
Test: manual - on Mobile Settings
Merged-In: I06b6c61304f9e6c9515b5f989294417ac3f82a60
Change-Id: I5cb16b60a7bf5df5b048e539f89bfedc43aa1582
2024-06-20 16:44:14 +08: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
Chaohui Wang
e36a2d863e
Clean up unused fields from MobileNetworkRepository
...
Bug: 348118234
Flag: EXEMPT refactor
Test: manual on Mobile Settings
Change-Id: I45520aac3bd3f2e31c396056f4f38b52e4e6fa55
2024-06-19 15:40:54 +08: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