Commit Graph

87691 Commits

Author SHA1 Message Date
Kevin Chyn
c5dce3db57 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 am: 7ffcc2a517 am: f8414ceade
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: I05601d4c6e9100440dcd89de1df23c21624410bc
2021-06-04 02:03:27 +00:00
Trevor Black
ef2a06efc6 Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540 am: 9c5eb35143 am: 74d830fb7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: Idde3934c484c2f7fd3477c7fd2a019f643dfde34
2021-06-04 02:03:20 +00:00
Curtis Belmonte
5bbabc0082 Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f am: 45c393cad5 am: 5a27beb760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268

Change-Id: Ifc277a7e8ee0d4192279f7a41166edcd2bc2ef1d
2021-06-04 02:02:52 +00:00
Janis Danisevskis
81ac35492a Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev am: 04fdd614b6 am: 9ab6d471b4 am: f9043bc840
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14791340

Change-Id: Ic8ae67bee77fbcc35f19fbdad50747cc039c0a2b
2021-06-04 02:02:46 +00:00
TreeHugger Robot
8ce574c55d Merge "Remove silky flag from misc files" into sc-dev am: 55b577dff8 am: 30d79bd7e5 am: ffcbb27ebf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797782

Change-Id: Ia8425edf213bd3e89fd2cb581ff961105fc578bf
2021-06-04 02:02:41 +00:00
TreeHugger Robot
68fac1a3ff Merge "Remove silky flag for searching and help menu" into sc-dev am: ea2b64a92d am: 83e7e42f25 am: e64a7a67b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797777

Change-Id: I24cbd404e094bda0f221066497da547ae9e08795
2021-06-04 02:02:35 +00:00
TreeHugger Robot
8bbd2f2edf Merge "Fix slider RTL problem" into sc-dev am: 7bebe57631 am: f3125b7d99 am: 6fd97da723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788607

Change-Id: I21ff5b376cfa6e691074a11be19daab93e05ef46
2021-06-04 02:02:30 +00:00
TreeHugger Robot
7683512f1b Merge "Fix voice access problem on location page." into sc-dev am: 89fbeb6407 am: 9ba96e3d30 am: 0253f53344
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782145

Change-Id: I3f0c2e01fb1bdeff5b5c497e9d95df849b1644d7
2021-06-04 02:02:24 +00:00
TreeHugger Robot
9a6585e02f Merge "Update battery defender tip subtext" into sc-dev am: 2702e5ce80 am: d38e7e2568 am: 5ba70378da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788605

Change-Id: I9664188df01c5398f4d0035d4ca051c45d75519f
2021-06-04 01:55:54 +00:00
Kevin Chyn
f8414ceade Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 am: 7ffcc2a517
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: Ie9b3fd29e48dcecbaafaccd292341d756ced3e4b
2021-06-04 01:25:16 +00:00
Trevor Black
74d830fb7d Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540 am: 9c5eb35143
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: Iaef840ba4da22468cd4a93f363547ee78c762ea7
2021-06-04 01:25:10 +00:00
Curtis Belmonte
5a27beb760 Merge "Align assets and colors for biometric enroll intros" into sc-dev am: 70dfd5332f am: 45c393cad5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795268

Change-Id: If820eeab0ed7fd0c262db2f37edf2865f0e1ba82
2021-06-04 01:25:04 +00:00
Janis Danisevskis
f9043bc840 Merge "Enable the clear credentials buttons when wifi keys are installed." into sc-dev am: 04fdd614b6 am: 9ab6d471b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14791340

Change-Id: Iaba3757353965d26ce6e9cfc05332ff510ad2629
2021-06-04 01:25:00 +00:00
TreeHugger Robot
ffcbb27ebf Merge "Remove silky flag from misc files" into sc-dev am: 55b577dff8 am: 30d79bd7e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797782

Change-Id: I591707323d4c1857b80531da177b88901f42a1bf
2021-06-04 01:24:55 +00:00
TreeHugger Robot
e64a7a67b5 Merge "Remove silky flag for searching and help menu" into sc-dev am: ea2b64a92d am: 83e7e42f25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797777

Change-Id: Ia57436dc0046bcf6de239e3cc50085cdf180db56
2021-06-04 01:24:49 +00:00
TreeHugger Robot
6fd97da723 Merge "Fix slider RTL problem" into sc-dev am: 7bebe57631 am: f3125b7d99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788607

Change-Id: I5fe810c28649cd6b0ea80f390d00dfa6201e35a5
2021-06-04 01:24:44 +00:00
TreeHugger Robot
0253f53344 Merge "Fix voice access problem on location page." into sc-dev am: 89fbeb6407 am: 9ba96e3d30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782145

Change-Id: I319b7eb229d9687415b11e703f7acc4e692d7882
2021-06-04 01:24:39 +00:00
TreeHugger Robot
5ba70378da Merge "Update battery defender tip subtext" into sc-dev am: 2702e5ce80 am: d38e7e2568
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788605

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

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

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

Change-Id: I376870e8d4de57038475cf97ca94a68ab0b78df4
2021-06-04 01:13:43 +00:00
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
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