Commit Graph

82384 Commits

Author SHA1 Message Date
TreeHugger Robot
d22ae1b5e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 37e8f3f696 -s ours am: ee2d493495 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79f6711a5dc36a7dde32d4af0a3219528514ca7c
2021-06-03 19:38:46 +00:00
Bill Yi
b3d032b2b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79ef9e3fc8 -s ours am: fc601649d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief21f36777151c4ca393ae91b54675c3261e7604
2021-06-03 19:38:27 +00:00
TreeHugger Robot
700c6e09e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 23e3a2b7f2 -s ours am: 7221374cb4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d608146e3ddd16e2bfdc3e1b7191eaa523d739d
2021-06-03 19:38:02 +00:00
Bill Yi
729f6a8a41 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours am: aaa1ec13a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6dbfb32e4166d006d15bdd6cbb013fd12415f48e
2021-06-03 19:37:46 +00:00
TreeHugger Robot
f7ec7e18d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b475f57f13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6beba5cb807ff3334752a01d916fc857beb22302
2021-06-03 19:37:21 +00:00
TreeHugger Robot
03571296d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9999c2060159c0373b3fe50e922e19326b76157a
2021-06-03 19:36:36 +00:00
TreeHugger Robot
ee2d493495 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 37e8f3f696 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb19cfa91979f1a09ee28489307ec5c2368c5ee9
2021-06-03 19:35:47 +00:00
Bill Yi
fc601649d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79ef9e3fc8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89c120f2139d0025bc68f29c7867650d4f6f6ce8
2021-06-03 19:35:25 +00:00
TreeHugger Robot
37e8f3f696 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-03 19:26:07 +00:00
TreeHugger Robot
7221374cb4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 23e3a2b7f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99c5a89b3fcf1769a90b84fb8fdaf2760eaba66c
2021-06-03 19:17:01 +00:00
Bill Yi
aaa1ec13a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id22fcec0a379548a7a8ab597ca60d9cf398a779c
2021-06-03 19:16:47 +00:00
TreeHugger Robot
b475f57f13 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:09:39 +00:00
TreeHugger Robot
bba877accb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-03 19:07:07 +00:00
TreeHugger Robot
23e3a2b7f2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:01:32 +00:00
TreeHugger Robot
5753862c9e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-03 18:51:21 +00:00
TreeHugger Robot
f189c24095 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-03 18:49:21 +00:00
Chloris Kuo
c2a0a1c3ae Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: Id6966bb3aa9ba661dc6241bf34199b3524126c58
2021-06-03 17:36:55 +00:00
Chloris Kuo
8f5ccfaef0 Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev 2021-06-03 17:29:59 +00:00
Abel Tesfaye
084d9f864b Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065

Change-Id: I99312fa02d58f7aff05b38c8d804635e814c2f85
2021-06-03 16:56:50 +00:00
Abel Tesfaye
040e5ef894 Merge "Use list+ toggle on devices without face detection" into sc-dev 2021-06-03 16:40:58 +00:00
Bill Yi
63d431cc10 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1966dd5e76cefd8e8f0677baed1f126e0e6eb2af
2021-06-03 14:55:46 +00:00
Bill Yi
fd3f0ca4e3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib26a56ed3bcfccc0790194113da3691d499f11b8
2021-06-03 14:51:55 +00:00
Bill Yi
6dece1ee8e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I57219c7709c527cc09d1289a9b15f10ca93b1bea
2021-06-03 14:44:41 +00:00
Bill Yi
6fbb03b185 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I74332e7a4c547a586f7a8a18fff4576de67a0c5a
2021-06-03 14:43:05 +00:00
Bill Yi
4eb046c301 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia0c5f6521d4f9753287aeefae610ae6168ebac1a
2021-06-03 14:38:44 +00:00
Bill Yi
6df7694b57 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie80bb50e4314ed1517c9cce073508f00232952bb
2021-06-03 14:35:21 +00:00
Bill Yi
79ef9e3fc8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib0518e9fef6a8e2d3ed71fda6d3acd6a5f8553b2
2021-06-03 14:32:28 +00:00
Bill Yi
f79b09d2bd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id7cdf9e26a6376493b203dfb8d6eb7dd777af745
2021-06-03 14:29:03 +00:00
TreeHugger Robot
d4d5f05a99 Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338

Change-Id: I59fb897332b5cd4a4654208c42a01a38f94ef698
2021-06-03 14:24:18 +00:00
Les Lee
44149f10c9 Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: Ic42db18cbc727089259f13729c2d0553fcc8b7cb
2021-06-03 14:23:28 +00:00
TreeHugger Robot
36c45e0ffd Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev 2021-06-03 14:09:08 +00:00
Les Lee
c48cf5ee37 Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev 2021-06-03 14:08:51 +00:00
Zoey Chen
3251ab68f9 [Settings] Modify the ordering of mobile plan preference.
Bug: 189409514
Test: make
Change-Id: I76a04b9c38ead0e3b9a2a4a21b50660caa15632b
2021-06-03 20:02:01 +08:00
TreeHugger Robot
2d68db1cef Merge "Fix broken test" into sc-dev am: f8641a4d86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883

Change-Id: I2c3f66b65295549d17a8993f92903660eee2671e
2021-06-03 10:04:33 +00:00
Syaoran Kuo
40f15073b0 Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665

Change-Id: Iaa5b48938ada0766d31ea9f5b9952ef7e2ffbca6
2021-06-03 10:04:15 +00:00
TreeHugger Robot
f8641a4d86 Merge "Fix broken test" into sc-dev 2021-06-03 09:55:08 +00:00
Syaoran Kuo
e4be9a7b62 Merge "Adjuest battery saver component test for new logic" into sc-dev 2021-06-03 09:42:43 +00:00
Galia Peycheva
ce064482cd Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507

Change-Id: I03bbc5361392321d43c7d6eb1873df384a29d8ad
2021-06-03 09:32:06 +00:00
Galia Peycheva
33a9f49892 Merge "Use SettingsLib string for blur developer option" into sc-dev 2021-06-03 09:12:36 +00:00
YUKAI HUNG
83d97a9e1c Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876

Change-Id: I23bc6382dbe300689347f6397411e04b15e9dee9
2021-06-03 08:21:00 +00:00
Tsung-Mao Fang
0b9ce16c13 Fix broken test
Fix: 190017630
Test: robo test
Change-Id: I46978a3f3d3d564cd9fcabad47edf6907d4e4966
2021-06-03 16:10:36 +08:00
YUKAI HUNG
fa476aef12 Merge "Remove missed added testing locale to cause flaky" into sc-dev 2021-06-03 07:50:55 +00:00
Betty Chang
1da8b1909d Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153

Change-Id: I6936974270bd665aa01d5b563f4312605842a725
2021-06-03 07:39:20 +00:00
Betty Chang
8689d3ebc1 Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873

Change-Id: I675fa7fc41dd061792bd4133a99b487b9dc516eb
2021-06-03 07:39:02 +00:00
tim peng
16394b6681 Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146

Change-Id: Ic5777b461d45a9ba9f35e613cc319adc706e1720
2021-06-03 07:38:44 +00:00
TreeHugger Robot
56a94afcb0 Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150

Change-Id: I2e4f112d3d1a4ef5fde0610079234544a3cacc58
2021-06-03 07:37:56 +00:00
Yanting Yang
f52d2b66b8 Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152

Change-Id: I98cff1d6d9cc03e0a33c066e3683771532994b69
2021-06-03 07:33:39 +00:00
Kunhung Li
bebc5063d2 Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322

Change-Id: I277dbe3339dee202925b2e055bcfd57e660b89d6
2021-06-03 07:31:46 +00:00
Les Lee
5294e3f9ab wifi direct: Close the channel after leaving the Setting page
Bug: 188375791
Bug: 184504089
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I4eff0472fd3cb12e006b5e85f5cdb6b979c93fe5
2021-06-03 15:31:28 +08:00
Jason Chiu
f979426151 Merge "Revise homepage colors" into sc-dev am: 132cc2127b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776

Change-Id: Iaa68b01d4b50767dab1052d1573ccf79e86e7573
2021-06-03 07:30:44 +00:00