TreeHugger Robot
f42a8893c6
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I0daddb467799ae48f25a1ecbf2e9b76081f96f1b
2021-08-04 07:28:12 +00:00
TreeHugger Robot
6f1bc2f52e
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev
2021-08-04 07:16:35 +00:00
Treehugger Robot
8f0658f24d
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717
am: 93a418718f
-s ours
...
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I1ba07ac8c0a20cf6f1422d2be60c00a10e304ba7
2021-08-04 01:59:51 +00:00
Xin Li
1d2519ade1
[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b
am: 4785355302
-s ours
...
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: Ic475987a1d6f0435fb4c4c77e28ada1b687878ff
2021-08-04 01:59:46 +00:00
Treehugger Robot
93a418718f
Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I86a2d120881f268b479b8a0e1bda3832fcb867bc
2021-08-04 01:28:25 +00:00
Xin Li
4785355302
DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I1cc9538054669c2c71105d44c8601fb1bf6e8579
2021-08-04 01:28:22 +00:00
Treehugger Robot
a529d8c717
Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1."
2021-08-04 01:05:56 +00:00
Yifan Hong
bbd851fea7
Merge "PairDevice to structured Parcelable." am: f7ff663887
am: eddbc8a356
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: Ife1bbb4e839ee6115b2809113c715068cdb94e59
2021-08-04 00:07:38 +00:00
Yifan Hong
eddbc8a356
Merge "PairDevice to structured Parcelable." am: f7ff663887
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: I6dcf1c7dab645aae4461a1100b580b5c8b2781ad
2021-08-03 23:46:26 +00:00
Yifan Hong
f7ff663887
Merge "PairDevice to structured Parcelable."
2021-08-03 23:32:27 +00:00
Xin Li
27ade80e6b
DO NOT MERGE - Merge RQ3A.210805.001.A1.
...
Bug: 192585466
Merged-In: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
Change-Id: I2bf4a9589a121a8bc2d2c4680a1fa081784a2e8a
2021-08-03 16:07:50 -07:00
Yifan Hong
1b586ec8dc
IAdbManager.getPairDevices returns FingerprintAndPairDevice[].
...
Map is not supported in C++ backend. To compile IAdbManager in C++,
Map is translated into a list of key, value tuples.
Test: pass
Bug: 190867939
Change-Id: I1a057306161a4f8eaef33e3c40b1db9494aea3e5
2021-08-03 14:05:32 -07:00
Yifan Hong
d61750990d
PairDevice to structured Parcelable.
...
Bug: 194829333
Test: pass
Change-Id: I202ae5aa16d4323afa2a48cc3070f8e13c701efd
2021-08-03 14:05:31 -07:00
Joe Bolinger
8a8f607218
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652
Change-Id: I7912e8ac26ee4c5cd611a8d7e535fb3f4f93d018
2021-08-02 21:26:51 +00:00
Joe Bolinger
fdb80de825
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev
2021-08-02 21:15:40 +00:00
Hugh Chen
a3a0661d1b
Fix "USB tethering" will auto turn on then off when turn off "USB tethering"
...
This CL only updates the "USB tethering preference" when
onTetheredInterfacesChanged() is invoked to avoid the
"USB tethering preference" being changed when received
non-tethering change intent.
Bug: 185590309
Test: make -j42 RunSettingsRoboTests
Change-Id: Ifed9f5c7edef670eeb21baf3841999382ee10ff2
2021-08-02 10:34:56 +08:00
Joe Bolinger
d5ea0ffe67
Skip enrollment when unicorn account is launched by setup wizard.
...
Bug: 194244555
Test: manual
Change-Id: Id310c5e4dec1b1c5262c9703259223ce21b1da61
2021-07-30 12:51:02 -07:00
Bill Yi
9c72a8c5f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7
-s ours am: 6deca0cd6b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428746
Change-Id: I73033d1b8888120b77e48edd8ce23eb1beca3b7e
2021-07-30 14:52:58 +00:00
Bill Yi
6deca0cd6b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428746
Change-Id: I02489ddc8a2047d651d7bf64ff98a75c6c90cd6a
2021-07-30 14:42:43 +00:00
Bill Yi
2487eee891
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e
-s ours am: 16693aaca0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: I4851fff1d80fbbd507ac78300bed7ae7141d2271
2021-07-30 14:21:09 +00:00
Bill Yi
16693aaca0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: I472c9c04799848a0382c2af447d442b73bad4bd0
2021-07-30 14:16:37 +00:00
TreeHugger Robot
b90e48ad64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15430931
Change-Id: I536a95a89ff1243f1e87e340b923564f70e7c190
2021-07-30 14:15:47 +00:00
TreeHugger Robot
7399e2deaa
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-30 14:07:33 +00:00
Bill Yi
63c32865cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I66bde249f1f3d460a40ccd3fb9daf61f7be202dd
2021-07-30 12:06:46 +00:00
Bill Yi
296d41309e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0e84b422b86e7195aac236b569828f1a0760ad7e
2021-07-30 11:53:32 +00:00
Bill Yi
e5d2e077c7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c108f50853f1de14c4df8d52bdcc4211f05278b
2021-07-30 11:39:05 +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
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
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
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
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
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
8f4ab88d14
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b515d34c40
-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: Iccff1e583d8c6bf13a281c56d2e600319331bfed
2021-07-28 23:51:16 +00:00
Bill Yi
b13a1025fe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c818c3b4a
-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: I871599dec295a595cb19ef0441bca6579d96bd73
2021-07-28 23:50:46 +00:00
TreeHugger Robot
b515d34c40
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2021-07-28 23:37:43 +00:00
Bill Yi
8c818c3b4a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id06c20035f64636a8b7799fbb847fdf852b70e4b
2021-07-28 15:13:59 -07:00
Bill Yi
b23c15307c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieede676484ceb3dbefc8c6aaf0b90a1043fe6ed1
2021-07-28 15:10:23 -07:00
Yu-Han Yang
1043fd1cf5
Update the "Location services" header to be sentence case
...
Bug: 191300716
Test: string update only
Change-Id: Ib1194847b9d2b817fa1b8581dc62cd2c1d85da26
2021-07-28 13:01:18 -07:00
SongFerngWang
9d9d06ab24
Fix the wrong comparison am: 1bcba3d23f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: If39ce68a76790912d69dfce084bbf8b9421f8ec0
2021-07-28 17:03:56 +00:00
SongFerngWang
1bcba3d23f
Fix the wrong comparison
...
Bug: 173387374
Test: atest NetworkSelectSettingsTest (PASS)
test on real device (PASS)
Change-Id: Ib1135b0457b4e35db67e671cad142657457d6d75
2021-07-28 14:15:31 +00:00
Bonian Chen
3f0dc952ac
[Settings] Allow disabled SIM to be controlled in UI
...
Disabled SIM are hidden from UI due to the API only check if there's a
SIM with mobile data capability active within device.
Right now, the UI design has been changed. The UI here should be
accessible no mater with or without the support of mobile data.
Bug: 193820245
Bug: 194761536
Test: local
Change-Id: I9c8b8fa16e74cd0fe4419966cc97ad55b5b87b17
(cherry picked from commit 847f326cd4
)
(cherry picked from commit a8ce9abde7
)
2021-07-28 11:58:23 +08:00
Zoey Chen
046c8d4a97
Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352
Change-Id: I6e15a328c230cae09f8a980cf86cb9f09a577655
2021-07-28 03:40:11 +00:00
Zoey Chen
1a6982f195
Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev
2021-07-28 03:21:12 +00:00