Commit Graph

86152 Commits

Author SHA1 Message Date
TreeHugger Robot
9ef9224d0c Merge "Update battery defender tip subtext" into sc-dev am: 2702e5ce80 am: eb9360fa97 am: f5bdc3cd41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788605

Change-Id: Ia638ce02088caa4a76199fdd7e1e663cbb5c5197
2021-06-02 08:57:18 +00:00
TreeHugger Robot
f5bdc3cd41 Merge "Update battery defender tip subtext" into sc-dev am: 2702e5ce80 am: eb9360fa97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788605

Change-Id: I9e6c91e99ff92df18153a818d844c50b0a4a10f4
2021-06-02 08:49:25 +00:00
Stanley Wang
60cf6b0bb7 Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38 am: 55ee50d381 am: 72983e34fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

Change-Id: Ie8fe5b6dc928537c1a28c3c65a0fbc7a830b590d
2021-06-02 08:46:03 +00:00
TreeHugger Robot
7ac8f82441 Merge "Remove the face unlock category" into sc-dev am: 3af33cd3fc am: 9cc7d4b581 am: 982800ffab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732241

Change-Id: I8aef27090f3c530cfe7391ae7fbb651c18932065
2021-06-02 08:45:23 +00:00
TreeHugger Robot
eb9360fa97 Merge "Update battery defender tip subtext" into sc-dev am: 2702e5ce80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788605

Change-Id: Ic1c8dffed05eaf73e7c5d6958701a7b1eec4d8c3
2021-06-02 08:33:11 +00:00
Stanley Wang
72983e34fd Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38 am: 55ee50d381
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

Change-Id: I533772758fbb304d5bfc3d93c58eacc0a951d4ca
2021-06-02 08:25:57 +00:00
TreeHugger Robot
2702e5ce80 Merge "Update battery defender tip subtext" into sc-dev 2021-06-02 08:25:51 +00:00
TreeHugger Robot
982800ffab Merge "Remove the face unlock category" into sc-dev am: 3af33cd3fc am: 9cc7d4b581
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732241

Change-Id: Iab3727722b3130a78452979d936b7f2a42845e15
2021-06-02 08:25:50 +00:00
Stanley Wang
55ee50d381 Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

Change-Id: I414fa4bc7c652afb52a1a351958497558b373107
2021-06-02 08:23:47 +00:00
TreeHugger Robot
9cc7d4b581 Merge "Remove the face unlock category" into sc-dev am: 3af33cd3fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732241

Change-Id: I3f0808a55fc768c4605e6b311d5c65217e394833
2021-06-02 08:23:33 +00:00
Stanley Wang
b4b35a8c38 Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev 2021-06-02 08:05:57 +00:00
TreeHugger Robot
3af33cd3fc Merge "Remove the face unlock category" into sc-dev 2021-06-02 07:59:42 +00:00
TreeHugger Robot
978ce53b58 Merge "Apply sliding transition to trust agent." into sc-dev am: fffda8de08 am: 6907efdb72 am: eadbf50bc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786716

Change-Id: I4a7c4f244b82affe3281363ae7f230172a5c5334
2021-06-02 07:22:55 +00:00
Menghan Li
c2af625d7c 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: 884fcfd72d am: c3e83e5106
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

Change-Id: I2b553dc0ce8a50c932442828258a65338b8d39c5
2021-06-02 07:22:28 +00:00
TreeHugger Robot
eadbf50bc4 Merge "Apply sliding transition to trust agent." into sc-dev am: fffda8de08 am: 6907efdb72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786716

Change-Id: I11b57028feddb79822c12b5a23c9fd454128dbe6
2021-06-02 07:02:52 +00:00
Menghan Li
c3e83e5106 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: 884fcfd72d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

Change-Id: I56aea51a2fee4efe6f065ae7d0a63e0b5eac8bc4
2021-06-02 07:02:46 +00:00
TreeHugger Robot
6907efdb72 Merge "Apply sliding transition to trust agent." into sc-dev am: fffda8de08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786716

Change-Id: I55955cecac9a24349642b66e6b3df22d4184ad8c
2021-06-02 06:46:50 +00:00
Menghan Li
884fcfd72d 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

Change-Id: I8bcf4f0e66af8513618609f83a9bcbb4761a1dde
2021-06-02 06:46:32 +00:00
TreeHugger Robot
fffda8de08 Merge "Apply sliding transition to trust agent." into sc-dev 2021-06-02 06:39:03 +00:00
Menghan Li
58ed6a90fe 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 2021-06-02 06:26:00 +00:00
Wesley.CW Wang
046e7beaef Update battery defender tip subtext
Bug: 189888727
Test: m RunSettingsRoboTests
Change-Id: I5dc3bed3f839b3f62d2e78f0ae16b5465035e1fc
2021-06-02 13:39:07 +08:00
Bonian Chen
2519bec539 Merge "[Settings] Connected carrier should not be forbidden ones" 2021-06-02 05:12:40 +00:00
Wesley Wang
f29e4d6fdb Merge "Update battery settings string" into sc-dev am: e678e2da06 am: f5404dc0bf am: f760e06d47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788594

Change-Id: I86187ef77e2045a45497bb6900239125e13eb75e
2021-06-02 04:47:59 +00:00
Les Lee
67fa425454 Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda am: 371ffdc357 am: e56e94b7a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786726

Change-Id: I14f79f84f729dd24e16d92a6fa16440080215f0e
2021-06-02 04:47:38 +00:00
Wesley Wang
67ea125039 Merge "Update battery error layout" into sc-dev am: 431e77d429 am: 5abef61536 am: a121362d05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085

Change-Id: I2955c75d8744bf73fe217c1b1341e7795b4051d0
2021-06-02 04:45:58 +00:00
Wesley Wang
f760e06d47 Merge "Update battery settings string" into sc-dev am: e678e2da06 am: f5404dc0bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788594

Change-Id: Id90be7765d5fd01fe2c16a5f86061cc51f982492
2021-06-02 04:28:11 +00:00
Les Lee
e56e94b7a4 Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda am: 371ffdc357
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786726

Change-Id: I72ee9557359a1cf1fe391451f4efdacf3555eb2a
2021-06-02 04:27:56 +00:00
Wesley Wang
a121362d05 Merge "Update battery error layout" into sc-dev am: 431e77d429 am: 5abef61536
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085

Change-Id: Ic958c7ce28233770135ddd6ab1177bc96fd9acb3
2021-06-02 04:26:45 +00:00
Wesley Wang
f5404dc0bf Merge "Update battery settings string" into sc-dev am: e678e2da06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788594

Change-Id: I073e69dc3e8908a419dc564f1a6b9128d6c96f2d
2021-06-02 04:01:41 +00:00
Les Lee
371ffdc357 Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786726

Change-Id: If484e7e529af0041a49c4aa98f693d654669567c
2021-06-02 04:01:13 +00:00
Wesley Wang
5abef61536 Merge "Update battery error layout" into sc-dev am: 431e77d429
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085

Change-Id: I072d3160d86825416d32c1ae24740fb2019b3cc7
2021-06-02 03:59:07 +00:00
Wesley Wang
e678e2da06 Merge "Update battery settings string" into sc-dev 2021-06-02 03:41:07 +00:00
Les Lee
5246f75bda Merge "wifi: Use new API for data usage function" into sc-dev 2021-06-02 03:37:54 +00:00
Wesley Wang
431e77d429 Merge "Update battery error layout" into sc-dev 2021-06-02 03:37:28 +00:00
TreeHugger Robot
f1f2e371fd Merge "Remove all dividers in privacy page" into sc-dev am: 2076ebf2f7 am: d501c2d369 am: 52c8b8c1e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786727

Change-Id: I4fbcfb7b144b91e6193e60ba341f5824505f2501
2021-06-02 03:30:33 +00:00
TreeHugger Robot
9b69294dd5 Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046 am: 46857865b4 am: baed387430
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842

Change-Id: I599c29389a9497c3dfd8c8f12e46e5b26e5dc9b5
2021-06-02 03:26:53 +00:00
TreeHugger Robot
52c8b8c1e1 Merge "Remove all dividers in privacy page" into sc-dev am: 2076ebf2f7 am: d501c2d369
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786727

Change-Id: I7cfff0b5606fb7839ac04bdcebbfd2d7c4f6bbeb
2021-06-02 03:04:44 +00:00
TreeHugger Robot
baed387430 Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046 am: 46857865b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842

Change-Id: I1840a9b215baa9d69da485f70163e4ef38a62fc1
2021-06-02 03:04:28 +00:00
TreeHugger Robot
d501c2d369 Merge "Remove all dividers in privacy page" into sc-dev am: 2076ebf2f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786727

Change-Id: I1a9fb624109bc2af4bcd60cb173d63b601576c7e
2021-06-02 02:36:16 +00:00
TreeHugger Robot
46857865b4 Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842

Change-Id: I1a69824d9b40d667f184d6583540d1fc455d16b3
2021-06-02 02:35:58 +00:00
TreeHugger Robot
2076ebf2f7 Merge "Remove all dividers in privacy page" into sc-dev 2021-06-02 02:28:47 +00:00
TreeHugger Robot
9a839db046 Merge "Fix biometric content overlap with top/bottom bars" into sc-dev 2021-06-02 02:17:48 +00:00
Curtis Belmonte
af149b11fc Fix biometric content overlap with top/bottom bars
Sets a solid background for the status and footer bar shown on each of
the biometric enroll introduction screens, to prevent the content from
showing through.

Test: Manually tested face and fingerprint enrollment

Fixes: 189075189
Change-Id: I1a41dc911c5ac7ded94e33b25a9c0e990e93ba3f
2021-06-01 18:11:12 -07:00
Abel Tesfaye
c375003361 Merge "Update smart auto rotate string" into sc-dev am: 0dbbd148d5 am: 9d6d8b30cf am: cc3813b6b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504138

Change-Id: If207eece1568d12b23fdadf438c13e6fab013c8a
2021-06-02 00:58:10 +00:00
Abel Tesfaye
cc3813b6b9 Merge "Update smart auto rotate string" into sc-dev am: 0dbbd148d5 am: 9d6d8b30cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504138

Change-Id: I41fb2839504f8ce4b199a8d4a8a3fc2a401ca660
2021-06-02 00:37:04 +00:00
Abel Tesfaye
9d6d8b30cf Merge "Update smart auto rotate string" into sc-dev am: 0dbbd148d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504138

Change-Id: I4c910660e6afca2b1d13f65bcccaf495684dc4d7
2021-06-02 00:09:40 +00:00
Abel Tesfaye
0dbbd148d5 Merge "Update smart auto rotate string" into sc-dev 2021-06-01 23:44:12 +00:00
Bill Yi
7e1272825e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c2d3450ae -s ours am: b14070608e -s ours am: fae0532b29 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e2a46501887d7aa61cbf36de4982bc312526b56
2021-06-01 21:17:57 +00:00
TreeHugger Robot
7233b95761 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev am: 9e1e5ddb72 am: 1744af0d97 am: 282050ce95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14700128

Change-Id: Ic30fef16736f22437770a8365cf4d8c50ef39fdb
2021-06-01 21:06:04 +00:00
Bill Yi
79d7a92961 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c2d3450ae -s ours am: 2d4bb6b826 -s ours am: c20f5f692f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I63442868972ef95c2968b7df63fef7c39504ce8e
2021-06-01 21:05:46 +00:00