TreeHugger Robot
37e5684696
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
am: f39f9d2d3d
am: 91abd1277d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I88825778dedfa6b9f2203aa63e8f2ea87b008f98
2021-07-30 08:55:49 +00:00
TreeHugger Robot
19f6e4a49e
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
am: bc39d7f73e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I3de6a6e268a713517b5a29cbc15a7abe87844f5c
2021-07-30 08:45:31 +00:00
TreeHugger Robot
91abd1277d
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
am: f39f9d2d3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I40408cecd02422f1fa41ece7f160637294d172ca
2021-07-30 08:44:57 +00:00
TreeHugger Robot
db1a226c54
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
am: f719dd7a6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I5c79b7f727031f97222fa628b8865aaf2cc31a5c
2021-07-30 08:44:43 +00:00
TreeHugger Robot
f39f9d2d3d
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: I3587d9793b6e62402603f2d0a7ffa66c62704b9b
2021-07-30 08:32:41 +00:00
TreeHugger Robot
f719dd7a6c
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: Iede0416114c004a9f66c8a93fdd05cd22d53ff26
2021-07-30 08:32:02 +00:00
TreeHugger Robot
bc39d7f73e
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307
Change-Id: Ic9337fe64ae71afa60bbe6d8e3ef4a2a511b6cd9
2021-07-30 08:30:58 +00:00
TreeHugger Robot
74060d3158
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev
2021-07-30 08:18:01 +00:00
Ahan Wu
a551ea537c
Use new api to create InteractionJankMonitor.Configuration.Builder
...
The api to create InteractionJankMonitor.Configuration.Builder has
changed, adopt the new api.
Bug: 170708749
Test: build pass
Change-Id: I627370fed43630750eab2ec9752338fb03753463
2021-07-29 19:22:54 -08:00
Treehugger Robot
c71af48782
Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3
am: f5876a1df9
am: 9cfd6a6164
am: bd71ddc59b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501
Change-Id: If1d8252f6641658af7be154ebdbe118db2a9e92a
2021-07-30 03:15:07 +00:00
Treehugger Robot
bd71ddc59b
Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3
am: f5876a1df9
am: 9cfd6a6164
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501
Change-Id: I9d3f933e3fa5c68e34e97f9b4191022c5d0aee8b
2021-07-30 03:00:43 +00:00
Treehugger Robot
9cfd6a6164
Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3
am: f5876a1df9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501
Change-Id: I9966577fec0160fb4c13cde9cfcf7bf8d7b5697d
2021-07-30 02:45:06 +00:00
Treehugger Robot
f5876a1df9
Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501
Change-Id: I818ae58baa161689a867cea8bc4662db602dfdcb
2021-07-30 02:35:23 +00:00
Treehugger Robot
060bf953e3
Merge "Fix memory leak in TopLevelBatteryPreferenceController"
2021-07-30 02:18:11 +00:00
Joe Bolinger
e4509b1cc9
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
am: 21ef1830ea
am: 6cab6458d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: If0687c468eb91a1a3d78bb2d4283d35b45016850
2021-07-30 02:04:54 +00:00
Joe Bolinger
a69d97a6e6
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
am: 769447a502
am: 24a3796f7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I189313c9eaf6d05fa5b06872f1b8c51056094255
2021-07-30 02:04:28 +00:00
Joe Bolinger
6cab6458d6
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
am: 21ef1830ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I9980fa2cbaabec648590902df007d21ab1c7f893
2021-07-30 01:50:43 +00:00
Joe Bolinger
24a3796f7c
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
am: 769447a502
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I264232763f7e0af216291368ae5f704942f12ad7
2021-07-30 01:50:19 +00:00
Joe Bolinger
0e4f451cc1
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
am: cd50557c3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: Idb9a72ae857be801a8f74fe75da0d2d91b09c171
2021-07-30 01:49:56 +00:00
Joe Bolinger
769447a502
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: If88427e1b7ed4d5227c821ab65e47f52cc9c5481
2021-07-30 01:36:43 +00:00
Joe Bolinger
cd50557c3f
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: If4c0396b8b89dae066a9c44f4adc31f14139e7a7
2021-07-30 01:36:02 +00:00
Joe Bolinger
21ef1830ea
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I4c5dd9f9a73e7bc83d8e5c0ccf90358f8bdc8383
2021-07-30 01:35:07 +00:00
Joe Bolinger
12e161d1dc
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev
2021-07-30 01:21:55 +00:00
Joe Bolinger
91d7545826
Limit biometric enrollments when Unicorn account is present.
...
This prevents biometric enrollment from happening after consent
has been obtained and is being managed by family link.
Note that this requires a corresponding change the setup wizard app
to work in most cases.
Bug: 193577587
Test: manual (enroll then relaunch SuW and repeat)
Change-Id: If260e49f38a141931d7f3362c1faf80ee7790232
2021-07-29 15:43:04 -07:00
Evan Severson
7edd7040bc
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 1ea7d23088
am: 14b7870359
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: I33e11cecd5fd2cc05e91b2655d4213ddd0071d12
2021-07-29 20:28:16 +00:00
Evan Severson
0e5b24df9b
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 8a1461a212
am: e2b8e585b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: I15281c3e8de1b46f05461173c3a0381d0fa03c1b
2021-07-29 20:28:05 +00:00
Evan Severson
14b7870359
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 1ea7d23088
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: Ic9d017314e117b01c6b89d551c35ec6c334ab26e
2021-07-29 20:16:03 +00:00
Evan Severson
e2b8e585b1
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 8a1461a212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: Id015925230ad1cea4063edc0cb197b54bbf2950c
2021-07-29 20:15:42 +00:00
Evan Severson
422705ab6f
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 4f253570f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: I6f832b9d5e67acd4351a6bf045f57b8b370637e1
2021-07-29 20:15:17 +00:00
Evan Severson
8a1461a212
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: I02ba1737c89d0f85012586ead62b0835f67d2397
2021-07-29 20:01:45 +00:00
Evan Severson
4f253570f8
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: I49aff7021bff62248bb48e4be01f522c60fcec44
2021-07-29 20:01:04 +00:00
Evan Severson
1ea7d23088
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: I23b162a2acae20a9621e84ba3953c12ebbe57e41
2021-07-29 20:00:10 +00:00
Evan Severson
405fac1ca0
Merge "Set toggle state for profile group" into sc-dev
2021-07-29 19:45:59 +00:00
TreeHugger Robot
5f5414477a
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 14073ffdbb
am: 61ef2b16a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: Ib93e354a928fd3fea1c343f87698329390d00db3
2021-07-29 15:48:00 +00:00
TreeHugger Robot
b74fa1d339
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 84286f0ea1
am: 09b7117716
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I45ef50bf0691bfcce5fa6ac1b4bd5d73442c9c53
2021-07-29 15:47:40 +00:00
TreeHugger Robot
61ef2b16a0
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 14073ffdbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: Ib90d8b40b6f9171d7a17ca4f2dddc72485777859
2021-07-29 15:34:23 +00:00
TreeHugger Robot
09b7117716
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 84286f0ea1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I4642b4900ff44d764cfe7cd3474c7b08524e26fb
2021-07-29 15:33:51 +00:00
TreeHugger Robot
e5e712ab5d
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 9409d32ef7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I46111002cedfcc3c34e6ae291cdc95e21a7f4ddb
2021-07-29 15:33:25 +00:00
TreeHugger Robot
84286f0ea1
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I25d5844d8dd7d58bcc84779441d8984db3efd07e
2021-07-29 15:21:53 +00:00
TreeHugger Robot
9409d32ef7
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I919eb96cae9c555e8cf37ad157ef9690e4bce8fd
2021-07-29 15:21:07 +00:00
TreeHugger Robot
14073ffdbb
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I0bc2e0daa4d6b8a5f404d853bf92999e42ef4a9b
2021-07-29 15:20:30 +00:00
TreeHugger Robot
68d15388f4
Merge "Update the "Location services" header to be sentence case" into sc-dev
2021-07-29 15:06:45 +00:00
jasonwshsu
9ccb9f56ca
Update the preview image in 'Accessibility button & gesture' page.
...
* Put images in drawable/ and drawable-night/
Fix: 193081959
Fix: 193081959
Test: atest AccessibilityButtonPreviewPreferenceControllerTest
Change-Id: If0700e285920686cea6a815877af71fe6652d711
2021-07-29 17:39:17 +08:00
Anita Hemrajani
6187ec83a8
Fix memory leak in TopLevelBatteryPreferenceController
...
Assigning context.getApplicationContext() as context in
ConditionContextualCardController.
Bug: 181192885
Test: run connectivity module auo test pass
Change-Id: Iff35520f911a9fd62a0bbb5bbda20608e9d99246
2021-07-29 15:30:28 +08:00
TreeHugger Robot
ff94326a34
Merge "Fix Settings crash issue"
2021-07-29 07:25:15 +00:00
Weng Su
1caaf7447d
Fix Settings crash issue
...
- Add conditional checks to avoid UI updates when the fragment is
finishing or destoryed.
- Add conditional checks to avoid UI updates if the fragment resource is
not ready.
Bug: 185756174
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I506ee81985158b8992529440a31d2d5cfe81f441
2021-07-29 13:40:17 +08:00
TreeHugger Robot
3684220f2b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b515d34c40
-s ours am: 8f4ab88d14
-s ours am: 7d631b7a07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413151
Change-Id: Icc2fb4a62026b702b7ad344ed9e3ea529a7f9c77
2021-07-29 00:21:14 +00:00
Bill Yi
643e8edc2b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c818c3b4a
-s ours am: b13a1025fe
-s ours am: 11da8df2b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413153
Change-Id: Ia57fe737911fc236b1e37b096d79ea67179526a3
2021-07-29 00:20:26 +00:00
TreeHugger Robot
7d631b7a07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b515d34c40
-s ours am: 8f4ab88d14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413151
Change-Id: I0fa72fb70b9df0bda989de5e410abb0a03148f43
2021-07-29 00:09:29 +00:00
Bill Yi
11da8df2b2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c818c3b4a
-s ours am: b13a1025fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413153
Change-Id: Id705e0eabcb22c924e2defe443f65e9c326622ee
2021-07-29 00:08:58 +00:00