Commit Graph

83796 Commits

Author SHA1 Message Date
TreeHugger Robot
b5ec85872d Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046 am: fb0cacb30f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842

Change-Id: I5e2d28837f45e79d2450ea93c377b7e9f19a71c0
2021-06-04 00:24:51 +00:00
Abel Tesfaye
1f02129c95 Merge "Update smart auto rotate string" into sc-dev am: 0dbbd148d5 am: 8b9c1ce735
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504138

Change-Id: I2bc81a26210219eeabab8ff94f0457d8bfaf7009
2021-06-04 00:24:46 +00:00
TreeHugger Robot
3796ef53c2 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev am: 9e1e5ddb72 am: 8eb8bfec86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14700128

Change-Id: Ife384bfc3f3d850e945e06a264a1025ec96c654e
2021-06-04 00:24:36 +00:00
TreeHugger Robot
4acb047d94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 37e8f3f696 -s ours am: ee2d493495 -s ours am: 81a9df9fb1 -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: I16b51d2d7d45c1f410552e5d1c388b90fadfcf98
2021-06-03 19:53:48 +00:00
Bill Yi
b0555c8618 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79ef9e3fc8 -s ours am: fc601649d9 -s ours am: 5b3ee99393 -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: Icfe1706c49e6f1dd371c33400f863d5d78caad6c
2021-06-03 19:53:43 +00:00
TreeHugger Robot
5d4d92d52f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 23e3a2b7f2 -s ours am: 7221374cb4 -s ours am: 308295f4cf -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: I9dacd41206037eb37748266bff5e3104da05546b
2021-06-03 19:53:39 +00:00
Bill Yi
6e4420138f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours am: aaa1ec13a4 -s ours am: 8501fcf38e -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: I12bf774e282ba690c49acb2669d438b54c9279e7
2021-06-03 19:53:30 +00:00
TreeHugger Robot
4334f338b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b475f57f13 -s ours am: 1476c1a9e9 -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: I8f75b3090a2e67304b99e77f76ef7421c0a654f8
2021-06-03 19:53:18 +00:00
TreeHugger Robot
b241f49bee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours am: 9ed875897b -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: I370da9ef15cccdaf47db9ad06ff4f5cf287faa0e
2021-06-03 19:52:53 +00:00
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
81a9df9fb1 [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: I6e11e1e2c546bc0f34e9c902216587d71eb24349
2021-06-03 19:37:11 +00:00
Bill Yi
5b3ee99393 [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: Idebe376bbf278200a780e455f362f17a68dd818a
2021-06-03 19:36:42 +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
308295f4cf [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: Iaa3ef46c128dfbce974fa2e3f86f18fa29cc8c15
2021-06-03 19:36:23 +00:00
Bill Yi
8501fcf38e [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: Ic673bb7e89bc500f29bcdd45f64900c177037037
2021-06-03 19:36:00 +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
TreeHugger Robot
1476c1a9e9 [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: Ibd2912a6d73dd89bca96cef80fe65de083fd92e3
2021-06-03 19:35:34 +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
9ed875897b [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: Ice81a271e5c6f70b86559ac1f174759a8d3d1f0b
2021-06-03 19:34:38 +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
1bb421e6e2 Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0 am: 511a2ceffa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: I3feb82139f684ed0c9107102857caeef544b0399
2021-06-03 17:45:11 +00:00
Chloris Kuo
511a2ceffa 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: I143807946ce9ad4591320aef21ed34b175e08faf
2021-06-03 17:42:33 +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
a44ce91272 Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894 am: 09ed6e8e29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065

Change-Id: Id25985076f0dbb76c2744aa5833a35458046bffa
2021-06-03 17:19:24 +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
09ed6e8e29 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: Ia50dc8db66f913e916bc43a82ce010d0be0793c7
2021-06-03 16:52:43 +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
Julia Reynolds
c94f997a2f Fix broken test
Test: robotests
Fixes: 189352955
Change-Id: I31066a6fdd72e923369e613b656ffe767b3e3b5c
2021-06-03 10:52:18 -04: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
TreeHugger Robot
47f39928ee Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd am: fb8d1ab61b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338

Change-Id: I2acfc5a8139a708dbd3acb642405bea5214be66b
2021-06-03 14:45:40 +00:00
Les Lee
54ef94eded Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37 am: 0c4c0e5e33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: I352a679b8e247c0215f8c5890f3a99e7fae23de3
2021-06-03 14:45:24 +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