Commit Graph

87973 Commits

Author SHA1 Message Date
Menghan Li
45725f719c 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 am: 38c8b94682
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

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

Change-Id: I372cae62ff3779cb02b5fca722f6f58da29af41e
2021-06-04 01:13:29 +00:00
Les Lee
0d33d07f55 [automerger skipped] Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda am: 9d89f8fc86 -s ours am: 01361fc0eb -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: Id95e5ce93e639f534c76b44c59775a30db5fb663
2021-06-04 01:05:38 +00:00
Wesley Wang
747aaae2c3 Merge "Update battery error layout" into sc-dev am: 431e77d429 am: 80bb5b005e am: 4863d514fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085

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

Change-Id: Ib0815ecbbd4cbb9d2c476966d724368d26e48176
2021-06-04 01:05:16 +00:00
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
Kweku Adams
1e7914460a Add OWNERS file for TARE.
Bug: 189850067
Test: N/A
Change-Id: I786da04d0806c045977a7517fe6a65f162a22543
2021-06-03 16:33:17 -07: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
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
TreeHugger Robot
a2da3b7769 [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: I19aab83f94be59753b2e278e60ad8651e5f98ca8
2021-06-03 19:38:33 +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
Bill Yi
328b6b1133 [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: Ib8b4032d498f7e932ad3443fb28bbda00ae356f3
2021-06-03 19:38:24 +00:00
TreeHugger Robot
da1f092ff6 [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: I975619762eee55bdc55f5f64f48d01cad8d90ed7
2021-06-03 19:38:02 +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
Bill Yi
01e5331975 [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: Iae64636d5e171f8b4ad9774449831b896da37142
2021-06-03 19:36:39 +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
TreeHugger Robot
74aef75430 [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: Id1d987439f41fd1aa521e7ba123f416368d09c8b
2021-06-03 19:36:02 +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