Commit Graph

87727 Commits

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

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

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

Change-Id: Ie1178379f2673879c10d3b3f7c59a4a620624d45
2021-06-04 00:53:46 +00:00
Stanley Wang
57a319f03b Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38 am: 090c1db54b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

Change-Id: Iced7e7be17d5630be9debbef5f1faecc3453768e
2021-06-04 00:48:57 +00:00
TreeHugger Robot
dbbe33cedd Merge "Remove the face unlock category" into sc-dev am: 3af33cd3fc am: 3da51e2fa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732241

Change-Id: I6da1277e11fe7faace90b03af98e61c231b0efd3
2021-06-04 00:48:50 +00:00
TreeHugger Robot
e0e5f2f6a0 Merge "Apply sliding transition to trust agent." into sc-dev am: fffda8de08 am: 5ec95d91ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786716

Change-Id: Ibd4e355a9649412da22aec9c1ce19cc2dcdf7395
2021-06-04 00:48:45 +00:00
Menghan Li
38c8b94682 Merge "Fix the link text "Learn more" in the accessibility pages with help links could not convey the link's purpose clearly" into sc-dev am: 58ed6a90fe am: 7f352f0030
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

Change-Id: I88b440123fc565d427fcf56956872ac8cb34889f
2021-06-04 00:48:40 +00:00
Wesley Wang
a43e630d64 Merge "Update battery settings string" into sc-dev am: e678e2da06 am: d2d83c7bdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788594

Change-Id: I2f0f717012c2094326489158f5c7b7afdb64d2f4
2021-06-04 00:44:54 +00:00
Les Lee
01361fc0eb [automerger skipped] Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda am: 9d89f8fc86 -s ours
am skip reason: Merged-In I6fbec14e7be4dc4b5c2fd3659a801521c81b233c with SHA-1 5012cef58f is already in history

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

Change-Id: I96169606034c8872400b64651a1f34c8a91f0135
2021-06-04 00:40:06 +00:00
Wesley Wang
4863d514fd Merge "Update battery error layout" into sc-dev am: 431e77d429 am: 80bb5b005e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085

Change-Id: I6d835f4202e10457860fd449ee8c4fe552b01e21
2021-06-04 00:25:00 +00:00
TreeHugger Robot
0c5627ef4a Merge "Remove all dividers in privacy page" into sc-dev am: 2076ebf2f7 am: 975ddf380c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786727

Change-Id: I477c205f7cca6646d175800f1b49aa231c4ec36e
2021-06-04 00:24:56 +00:00
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
ade4bfef45 [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: 4acb047d94 -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: I0486d5c9729c2d3ea23d2c5c79e1bb996df7ebe5
2021-06-03 20:09:09 +00:00
Bill Yi
ea27cd45a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79ef9e3fc8 -s ours am: fc601649d9 -s ours am: 5b3ee99393 -s ours am: b0555c8618 -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: I250916df6cebb489b5e576930cca4e10b0d2a596
2021-06-03 20:09:04 +00:00
TreeHugger Robot
5b03c07626 [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: 5d4d92d52f -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: Ief6b64b0be286d758c6497a49d2e497852c3e959
2021-06-03 20:08:51 +00:00
Bill Yi
93e48656cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours am: aaa1ec13a4 -s ours am: 8501fcf38e -s ours am: 6e4420138f -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: I79dfff1d76eab2134c0c62ce89c509ec8743e04f
2021-06-03 20:08:33 +00:00
TreeHugger Robot
8bdcbb84d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b475f57f13 -s ours am: 1476c1a9e9 -s ours am: 4334f338b2 -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: I7ce600ad78b955be95d66ae09bf60d344cf41c79
2021-06-03 20:08:10 +00:00
TreeHugger Robot
2cec1372ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours am: 9ed875897b -s ours am: b241f49bee -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: Iff17025a8864983bbe6216af65f26009309d8c3a
2021-06-03 20:07:37 +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
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
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
4a3da4a2f2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-03 19:29:35 +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
dd8f1b8365 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-03 19:04:58 +00:00
TreeHugger Robot
23e3a2b7f2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:01:32 +00:00
Chloris Kuo
14c48731e6 Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0 am: 511a2ceffa am: 1bb421e6e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: I251ce347058eac0d829c09b5c959530f6df33156
2021-06-03 17:59:09 +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
Abel Tesfaye
f3cb092d6d Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894 am: 09ed6e8e29 am: a44ce91272
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065

Change-Id: Ifde0dcd5fa3cebe535d2f305c077642b265d51f2
2021-06-03 17:33:59 +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
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