Commit Graph

92087 Commits

Author SHA1 Message Date
Becca Milman
6c93ed7e69 Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f am: 6fdf6b293f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I8626de876860f09c7794872106e280ee5bb60272
2021-07-09 17:26:12 +00:00
Becca Milman
b25c6234bc Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f am: 32f84cc057
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I3f94ad09a9983fbe8bb41330703d3f79f022fbe2
2021-07-09 17:21:19 +00:00
Becca Milman
263ed9fc0e Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f am: aeb4301efa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I5d7238fb9daf5fb88a2a17fd8baa9c19ac30594e
2021-07-09 17:20:26 +00:00
Becca Milman
6fdf6b293f Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I702c25bf724f34ba6d114cf07fbee3cdbbb6f495
2021-07-09 17:08:40 +00:00
Becca Milman
aeb4301efa Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: Ifc2f68714b00657f345716311541d3585b78ba1f
2021-07-09 17:07:48 +00:00
Becca Milman
32f84cc057 Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I89966f6d42faa17df97d5d9311ef9a95311c4ba3
2021-07-09 17:07:44 +00:00
Becca Milman
06a92e109f Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev 2021-07-09 16:55:31 +00:00
TreeHugger Robot
520f7bdcca Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932 am: abf8a9ea63 am: 998635d69d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I712471570e75d27ad59df1d806aadb0c0854386c
2021-07-09 16:45:51 +00:00
TreeHugger Robot
e5351eac32 Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932 am: 3ec3e800ff am: 78b9774e94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I7cc65454f18a3a0bbbf394d78d457dab384ca5e0
2021-07-09 16:45:44 +00:00
Meng Wang
17ef8294c3 Refine WFC location notice text.
Bug: 190642193
Test: manual - see updated screenshot in the bug.
Change-Id: Ia417c8486dc324a65e41bfb667eaaf3bc9894033
2021-07-09 09:39:03 -07:00
TreeHugger Robot
998635d69d Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932 am: abf8a9ea63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I0b633cab684ff22555784cc151ff12359d5f5abc
2021-07-09 16:36:54 +00:00
TreeHugger Robot
78b9774e94 Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932 am: 3ec3e800ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I2921c82267a16f9e020c30cbeb00724b77f096f2
2021-07-09 16:36:26 +00:00
TreeHugger Robot
e214bba97f Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932 am: e21b555d0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I29bda54bbea61c7256c128267aed85f4cf17b7e0
2021-07-09 16:35:59 +00:00
TreeHugger Robot
3ec3e800ff Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: If503f1ef170b0a8b3a150607d38b78d0ba36bae8
2021-07-09 16:27:50 +00:00
TreeHugger Robot
e21b555d0a Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I7a9c8b8b4b4ee392a6970c468673f09634649578
2021-07-09 16:27:03 +00:00
TreeHugger Robot
abf8a9ea63 Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I2e0acdcfa86fef13eef290357fe148d3ad1806da
2021-07-09 16:27:03 +00:00
TreeHugger Robot
2a149d9932 Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev 2021-07-09 16:14:20 +00:00
Quang Luong
34c97860f9 Merge "Rename Enhanced MAC Randomization to Non-Persistent" 2021-07-09 14:55:57 +00:00
TreeHugger Robot
6fad80e9c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 861d1cc080 -s ours am: 92f0c16ab8 -s ours am: 35673e78b7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15241523

Change-Id: Ic1c6b4def7464fb3baffe80bdff832c54717d55e
2021-07-09 14:35:40 +00:00
TreeHugger Robot
5a2d8a9feb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 861d1cc080 -s ours am: 44b7394c34 -s ours am: 493c24742e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15241523

Change-Id: Ice51af3945be8bd6acf9d432460783dac6a3b321
2021-07-09 14:35:01 +00:00
TreeHugger Robot
35673e78b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 861d1cc080 -s ours am: 92f0c16ab8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15241523

Change-Id: I298e422a4089b3d77dd881949be904393115765c
2021-07-09 14:19:05 +00:00
TreeHugger Robot
6ffc075a60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 90f158ca41 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15241525

Change-Id: Ic2fcc222774b3d3499a675a028b39b8a2b0033fb
2021-07-09 14:18:42 +00:00
TreeHugger Robot
493c24742e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 861d1cc080 -s ours am: 44b7394c34 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15241523

Change-Id: I871df6d11ac4cb22971b44a93907dc16aa461386
2021-07-09 14:18:35 +00:00
TreeHugger Robot
187265b84d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 861d1cc080 -s ours am: 38bc8fc14f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15241523

Change-Id: Ib593b849002121e65c8f230ccf74fdff8414570c
2021-07-09 14:18:27 +00:00
TreeHugger Robot
90f158ca41 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-09 14:15:31 +00:00
TreeHugger Robot
44b7394c34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 861d1cc080 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15241523

Change-Id: Id493955ff995d71e20e10d60ac37a0bb40f0a0e8
2021-07-09 14:10:15 +00:00
TreeHugger Robot
92f0c16ab8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 861d1cc080 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15241523

Change-Id: I86bf36487218467dac8587bbaaa76465bf312644
2021-07-09 14:09:22 +00:00
TreeHugger Robot
38bc8fc14f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 861d1cc080 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15241523

Change-Id: I438ff8d67ef19aaf0f589150298b4199b2c95d27
2021-07-09 14:09:20 +00:00
TreeHugger Robot
861d1cc080 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-09 13:57:21 +00:00
SongFerngWang
f7073adf80 Fix internet panel doesn't show data rat after dds changed
The internet panel does not listen dds changed.

Bug: 193029917
Test: atest NetworkProviderWorkerTest
Change-Id: I58544ec2fd3f2bba5c6590ce54bcf68d0c83b06b
2021-07-09 20:16:04 +08:00
TreeHugger Robot
fd3bdc75bd Merge "Fix the flickering on display/font size page" into sc-dev am: 11c602bdf2 am: d33c3c4886 am: 7475c9b7e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15233450

Change-Id: I77c7a0826d221b9272f3d2e4e9dfd62fb20ff572
2021-07-09 09:41:08 +00:00
TreeHugger Robot
d0fd1ebddf Merge "Fix the flickering on display/font size page" into sc-dev am: 11c602bdf2 am: d968e76fc1 am: e79f0fd9d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15233450

Change-Id: Icc2b5839bb4fa769907ccdaa55c5940af178c19d
2021-07-09 09:40:56 +00:00
TreeHugger Robot
7475c9b7e3 Merge "Fix the flickering on display/font size page" into sc-dev am: 11c602bdf2 am: d33c3c4886
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15233450

Change-Id: I67ebe7dbca94a72e6337aa1725bd08e317e15efd
2021-07-09 09:26:28 +00:00
TreeHugger Robot
e79f0fd9d7 Merge "Fix the flickering on display/font size page" into sc-dev am: 11c602bdf2 am: d968e76fc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15233450

Change-Id: Idb1e60b14ab9a65a0a8f69f77a8ca5cc39178cae
2021-07-09 09:25:12 +00:00
TreeHugger Robot
254f682c65 Merge "Fix the flickering on display/font size page" into sc-dev am: 11c602bdf2 am: 341b9b5844
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15233450

Change-Id: I37ea2090a8f35b86bf3ac852cb257e5f5910d3b9
2021-07-09 09:24:44 +00:00
TreeHugger Robot
d968e76fc1 Merge "Fix the flickering on display/font size page" into sc-dev am: 11c602bdf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15233450

Change-Id: Ia0252f66841e0513b1e88623a174616844fc1df2
2021-07-09 09:15:43 +00:00
TreeHugger Robot
341b9b5844 Merge "Fix the flickering on display/font size page" into sc-dev am: 11c602bdf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15233450

Change-Id: Ia06d26e13ae258cb727630e710f33b0ec913c774
2021-07-09 09:14:54 +00:00
TreeHugger Robot
d33c3c4886 Merge "Fix the flickering on display/font size page" into sc-dev am: 11c602bdf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15233450

Change-Id: I6e030882c3082556ce30218c6d206b2240bfddaa
2021-07-09 09:14:51 +00:00
TreeHugger Robot
11c602bdf2 Merge "Fix the flickering on display/font size page" into sc-dev 2021-07-09 09:00:40 +00:00
TreeHugger Robot
10131ee88f Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e am: 70edc357a9 am: 000c323f8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: Id94d9a3b49b3c3aa425850dcbf0b09ee68326414
2021-07-09 08:55:12 +00:00
TreeHugger Robot
a76ce8ccd1 Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e am: 7cbff10736 am: bdbbadf046
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: I11543bd216c3306224e045ec7fdc786f9a7786e2
2021-07-09 08:54:56 +00:00
TreeHugger Robot
000c323f8e Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e am: 70edc357a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: Ie31f291ae79fcbb2c8b108cb269ba030e6d36d32
2021-07-09 08:36:39 +00:00
TreeHugger Robot
bdbbadf046 Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e am: 7cbff10736
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: Ia6407c21cb162fcc32f2891ae4e548f9b1a10896
2021-07-09 08:36:16 +00:00
TreeHugger Robot
40785a0bd7 Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e am: d6dbc7a944
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: Ie4d9b008ac21e51d99f4f5baf8c1f1bae565e09a
2021-07-09 08:35:51 +00:00
Betty Chang
3b725057fb Merge "Remove some attributes to move the dialog window up" 2021-07-09 08:31:11 +00:00
TreeHugger Robot
7cbff10736 Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: I706d0ad598acd587e616903a9242c10c29078ab8
2021-07-09 08:23:35 +00:00
TreeHugger Robot
d6dbc7a944 Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: Ib9c441b2cef7078026877f57cef96ef9d072b086
2021-07-09 08:22:41 +00:00
TreeHugger Robot
70edc357a9 Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev am: b4dccf9b8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221930

Change-Id: I84efecbce455f3d0879db85b7a313ae1d0a14367
2021-07-09 08:22:13 +00:00
TreeHugger Robot
b4dccf9b8e Merge "Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"" into sc-dev 2021-07-09 08:07:37 +00:00
YUKAI HUNG
da6dd6e630 Merge "Remove items from not allowed show summary list (legacy rule)" into sc-v2-dev am: a1e610b689 am: 04dc2ec138
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15236915

Change-Id: I8727082a70f36d9ca172386b7446c56ee50d8765
2021-07-09 07:11:55 +00:00