Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
141,245 Commits 1 Branch 0 Tags
fe88f8e1cd62024beaf7e421d00a20d4a717c425
Commit Graph

141245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Antol
fe88f8e1cd [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: 1a8d068be8 -s ours am: f5bb4f2aa6 -s ours am: d1e10278c5 -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: I4626cef521d7253e63dd1553de4e20fbf5fd4145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 02:19:49 +00:00
Chris Antol
45684e4b56 [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: f3a110e707 -s ours am: 32d00469c8 -s ours am: 7e7cd0627a -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: I6cec0ab9eafb48c800a92f7e37144e5d84a712e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 02:19:45 +00:00
Chris Antol
6994337dee [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 9e31e01946 -s ours am: 7e8fa4b3ce -s ours am: 8ca43bf8aa -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/+/27676295

Change-Id: Iae5ec8470e0ffa52e74bd77dff163ccd5d5c75d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 02:19:26 +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
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
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
d1e10278c5 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: 1a8d068be8 -s ours am: f5bb4f2aa6 -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: I940231df088e691be7257e24628f6153dd271e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 02:18:37 +00:00
Chris Antol
7e7cd0627a [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: f3a110e707 -s ours am: 32d00469c8 -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: I5d8c5c0016552a291803a77f35e30791ffd09439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 02:18:34 +00:00
Chris Antol
8ca43bf8aa [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 9e31e01946 -s ours am: 7e8fa4b3ce -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/+/27676295

Change-Id: I5057240366b73128a0231d9da65114fbbc40ac49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 02:18:22 +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
f5bb4f2aa6 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours am: 1a8d068be8 -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: Ie7550c405f3c82d315d73367b1f45c5974364dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 02:11:39 +00:00
Chris Antol
32d00469c8 [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours am: f3a110e707 -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: Ida19b276bde8e1c9ee55a35de8a588c280888c73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 02:11:34 +00:00
Chris Antol
7e8fa4b3ce [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88 am: 9e31e01946 -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/+/27676295

Change-Id: I559c2ed9f68683dfd083ae4034b7908dd703e5d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-21 02:10:43 +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
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
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
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
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
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
Chris Antol
4b073bf14c Merge "Ignore fragment attr from ext authenticator resource" into tm-dev 2024-06-21 01:28:56 +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
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