Becca Hughes
dc5e10e3cc
Add a couple of guards to make sure crash doesn't happen
...
This adds two guards, first checking when the provider
list is generated to stop and flag an warning, second
to have PackageMonitor use a handler so callbacks should
only happen on the thread that the fragment is running
on and if that is no longer available it won't do
anything.
Test: ondevice
Bug: 296164461
Change-Id: Iab03f8a10e667694e2e23da7574831f9ea5c38e2
2023-09-12 19:45:50 +00:00
Yuanru Qian
369b3f3ef9
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d am: 22a947a156 am: ea691aca93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: Ia0fa5945c13561d2d43f01ea05e8dee420adfcac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 18:43:09 +00:00
Yuanru Qian
ea691aca93
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d am: 22a947a156
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: I1a0c3b36915a42588aafdeaa41eca6fd57889350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 17:43:15 +00:00
Yuanru Qian
22a947a156
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: I0710a54b97a9b230c8802326687d76be7d7a51f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 17:04:28 +00:00
Yuanru Qian
945b20c70d
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: If6e8d7182b4c6feaca4da62052442f46f930b227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 16:14:39 +00:00
Yuanru Qian
81343f23fc
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: I366f3dddb68df63b2ae251e71610c4d1e33ceefe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 15:21:52 +00:00
Yuanru Qian
9ace1904c3
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main
2023-09-12 14:37:23 +00:00
Massimo Carli
e3c53f39a3
Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355 am: 7d297719d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24721236
Change-Id: I75fbcbb10b149bc16b2deead7645df992572e7a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 12:11:47 +00:00
Massimo Carli
7d297719d7
Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24721236
Change-Id: I8e95d9e9704649cbcb3eed980e3d0275116b4c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 11:16:24 +00:00
Massimo Carli
951bbde355
Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev
2023-09-12 10:09:19 +00:00
Yuanru Qian
8ffc3c728d
Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS
...
Change-Id: I29c44aec3a9065dd9e0c207faaea55da6ad21471
2023-09-12 07:39:43 +00:00
Massimo Carli
24aa9c8f15
Changed app string changes in user aspect ratio settings
...
Bug: 297288214
Test: Manual
Change-Id: I72c0b53d8d9db92b12d4e9507fcf40b1be76d745
2023-09-12 06:29:19 +00:00
YK Hung
f5a01823b1
Merge "Centralise time to full in SettingsLib" into main
2023-09-12 06:15:04 +00:00
Angela Wang
d84c60f2ac
Merge "Fix test failure of AvailableMediaDeviceGroupControllerTest" into main
2023-09-12 06:06:08 +00:00
Chaohui Wang
5bf2981d08
Fix SettingsUITests flakiness
...
Bug: 290684887
Test: atest SettingsUITests
Change-Id: I8f85c9c50eb3426b740c7ef3bf8996d6655bca0a
2023-09-12 11:44:50 +08:00
Eric Rahm
860fce72ec
Merge "Revert "Test Fix SettingRobolectricTest Fail"" into main
2023-09-11 17:56:16 +00:00
Becca Hughes
72dc40e42e
Only update settings UI if data changes
...
The flashing was caused by overzealous
reloading which should be fixed by this
CL.
Test: flash device
Bug: 299329723
Change-Id: I7d97da7f3c699ebea280a337bc64b8fe2f351126
2023-09-11 16:44:16 +00:00
Eric Rahm
802b922593
Revert "Test Fix SettingRobolectricTest Fail"
...
This reverts commit 818f77cd1f .
Reason for revert: Underlying issue fixed in ag/23454315.
Bug: b/275023433
Test: atest SettingsGlobalRoboTests
Change-Id: I1af272efd00b3c5bd35310512f5712d5d1c7d834
2023-09-11 13:38:36 +00:00
Manish Singh
7cd9300c1d
Merge "Add Private Space settings page" into main
2023-09-11 12:52:05 +00:00
Trina
bb21c0e1b7
Centralise time to full in SettingsLib
...
Test: atest SystemUIGoogleTests
Bug: 275679195
Change-Id: Ie4ca699e73e4ec48f2b0b8d95e61d0bd103f5e37
2023-09-11 11:16:58 +00:00
Chaohui Wang
e2e0af282a
Add DevelopmentSettingsTest
...
Bug: 290684887
Test: atest SettingsUITests
Change-Id: I3acda74c96679fcdb531990848e456d5da0ae239
2023-09-11 16:10:22 +08:00
Chaohui Wang
a35c6bc139
Fix more SettingsUITests
...
Also add SettingsUITests to postsubmit.
Bug: 290381395
Test: ui test
Change-Id: Ib1dd35bf7823290bf77deb31366e9cb6ae9f65f7
2023-09-09 22:02:56 +08:00
Massimo Carli
f1a1439d2b
[automerger skipped] Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev am: f2735decd6 am: de41256dd2 -s ours
...
am skip reason: Merged-In Iaf757715e60ab4ff2356ee0c89bc2129948a6c08 with SHA-1 eb7eee658b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24604368
Change-Id: I449ee24dcf5072178b6d35ff57a1010c287cac60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-09 00:42:19 +00:00
Bill Yi
2beeece303
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 0e9f6de1c9 -s ours am: aff2aa2b9b -s ours am: ae0e9ab922 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: Iae643fa4c4603e635a646827c80533763c12f189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-09 00:13:25 +00:00
Bill Yi
1052a92e5a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: cd4f7108da -s ours am: 12772adb2f -s ours am: 2d3e44aebb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: I79520cbaa2ff06c505879bd0a1d4841c42f79858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-09 00:13:12 +00:00
Bill Yi
4e3b574833
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: 3d3c8da953 -s ours am: d0bbda68e2 -s ours am: d635532a11 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686020
Change-Id: Ia670a53d7cdb174c8783b9a87e73532765e432c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-09 00:12:55 +00:00
Bill Yi
d527d09c89
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 74efc70012 -s ours am: 7ef30234c5 -s ours am: 47feed84d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: I87f9930a9dce86038bfe41f7cb8bd0edb9f96563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-09 00:06:03 +00:00
Bill Yi
845ed89c27
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: 26761dda7f -s ours am: 4a3e643a4e -s ours am: 2e6e7c1c25 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: Id2df0e72bebb12ef56ef8eb256383adaa89068ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-09 00:05:50 +00:00
Bill Yi
ee1cb9f40f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: a60c6f5165 -s ours am: d7897a49f4 -s ours am: d7d9e247d3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686020
Change-Id: I73f97e18976e789374d658f1e9202275b86de53d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-09 00:05:38 +00:00
Bill Yi
35561d6d73
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fc870f9cfd -s ours am: 70a9891a63 -s ours am: 38efaf3bc4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686019
Change-Id: I1f38acc949debf8e36e41275182c2041e2899a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-09 00:00:16 +00:00
Bill Yi
ac90d2dccc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1246d3046b -s ours am: 3144cb8a81 -s ours am: c697cc02ad -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686019
Change-Id: I5007f8f6f1553f7ecf94d3c5da7e0c26db2e3713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-09 00:00:02 +00:00
Bill Yi
b8413ad963
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152898c4a -s ours am: a00e73b28f -s ours am: a96743f2f8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24684077
Change-Id: I2b08b2b480131069584e6cd716f6caa4129efdd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:59:43 +00:00
Bill Yi
4d31705228
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb -s ours am: 74efc70012 -s ours am: 8dea913ea0 -s ours am: 4155a4facc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: Idb0d0e7cfa233711ca21f705d555d690569c6e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:55:05 +00:00
Bill Yi
20ab371d2a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd -s ours am: 26761dda7f -s ours am: 511dfc1d41 -s ours am: 6515020dcc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: I41a34fc8eaf0f780c28c790585d43e00b406b751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:54:50 +00:00
Bill Yi
0166cb98fa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa -s ours am: a60c6f5165 -s ours am: 832c2d522a -s ours am: b917484bfe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686020
Change-Id: I36bb7e518fd9d5111c3ddf5423dce0e6017fd6a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:54:34 +00:00
Bill Yi
8970ec9b53
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fc870f9cfd -s ours am: c111649efb -s ours am: 7405405f9c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686019
Change-Id: Iac4618a5bffb10b4fa185d2e20a4b9736d8dda40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:50:20 +00:00
Bill Yi
8fde1c2394
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1246d3046b -s ours am: 0f2887884e -s ours am: 0941557bc2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686019
Change-Id: I4bbd68b18a362665eaff5d2535ebf017e4c2eff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:50:06 +00:00
Bill Yi
5fb1cef1d9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152898c4a -s ours am: 6f0a9296a6 -s ours am: ef5b0e316a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24684077
Change-Id: I7bd5ea07565d63834bc8645a1b1d2ef2f0cb4bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:49:50 +00:00
Becca Hughes
3915464217
Merge "Add missing divider to credman settings" into main
2023-09-08 23:36:07 +00:00
Bill Yi
608b9a6b94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2527e8855f -s ours am: cbcfd27eec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686863
Change-Id: Ide26e8ad385cdfab65daad24d7d2536827a2ba80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:30:07 +00:00
Bill Yi
756145b19c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35b82f2c87 -s ours am: c73ea3e3a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686863
Change-Id: I1d03c7a37d06f43dbbe9dcdc056f8277b5f92e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:30:04 +00:00
Bill Yi
b3d685f851
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 95ff1dbb5e -s ours am: 05d03ffa6a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686021
Change-Id: If4cca795a673ec67245a7968dbe4c83f20fec088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:29:58 +00:00
Bill Yi
caa56327a2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4023686444 -s ours am: ecee93546a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686021
Change-Id: I5c5f6eea960beeb539d2e6a4b04c500fdeee23ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:29:54 +00:00
Bill Yi
2ecb751e5d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: bc882dc6a6 -s ours am: 61d9f6cff0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24684075
Change-Id: I092486e8196567061d575cf3574a282f57fd2311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:29:44 +00:00
Bill Yi
1307175f80
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c4039be6d -s ours am: a8854cdaaf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24684075
Change-Id: I96f57cd0bedb3982b096183947611836d396595e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:29:30 +00:00
Holly Jiuyu Sun
b04e2d5bd8
Merge "Change feature flag to device config flag." into udc-qpr-dev am: 54f96175a2 am: 04960fa7c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24606922
Change-Id: I00f10f208d012fdbf289cef39db5dbfdfd0c7e15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:21:05 +00:00
Jason Chang
711a0ee76a
Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: f6fdfb0ddc am: 99882cb3bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24499558
Change-Id: I891daf59d1c0ebd0789a5741778cbc6e65a2af66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:05:39 +00:00
Shivangi Dubey
512daee3f8
[automerger skipped] Merge "Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf" into udc-qpr-dev-plus-aosp am: c06568346c -s ours
...
am skip reason: Merged-In Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367 with SHA-1 dc485887cc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24314953
Change-Id: I90325597c9456e3bed06ff6d7944964766605a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:04:25 +00:00
Shivangi Dubey
d91eb9eae6
[automerger skipped] Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf am: 00a78fca41 -s ours
...
am skip reason: Merged-In Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367 with SHA-1 dc485887cc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24314953
Change-Id: I10e62322818f6859161964d7598d6edbc79cf969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 23:04:15 +00:00
Massimo Carli
de41256dd2
Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev am: f2735decd6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24604368
Change-Id: If09e05a6f965cef5432feca8b06043e45117dda2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 22:53:54 +00:00