Bill Yi
c86ec7306d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe
-s ours am: 3f0263ce7f
-s ours am: 07b6b22b7a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740620
Change-Id: I945fc1fb0d8b0dd0c3201be1a2b16f1f4db31b35
2021-05-28 16:31:47 +00:00
TreeHugger Robot
79d0907c49
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895
-s ours am: 197a03a9de
-s ours am: 4d604cdfbf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740732
Change-Id: I706e412e28ddbb154a719d05135c58e2a9895622
2021-05-28 16:31:16 +00:00
Bill Yi
7ca5092db4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84
-s ours am: 332a439d60
-s ours am: b257c75f38
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740731
Change-Id: Ice2ab93eceb974442ca2865a23eb5fb4ba5d6048
2021-05-28 16:25:20 +00:00
TreeHugger Robot
a418518fd0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c
-s ours am: 123386039b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740737
Change-Id: I28bbef627f3706ed9b2fcbebfff97132d602a8f4
2021-05-28 16:21:18 +00:00
Beth Thibodeau
f879401103
Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830
am: ff3fc65ac3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441
Change-Id: Id901a1fc59b639281395f09367f0371a5fdf1084
2021-05-28 16:05:29 +00:00
Betty Chang
5b9ff213e3
Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48
am: 4a42b08b79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646
Change-Id: I0f554a255d964d0b6c86a3abad11a0ed3a60102a
2021-05-28 16:05:19 +00:00
Kevin Chyn
107a499e8f
Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6
am: c00c3bdd03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437
Change-Id: Ie0ab96cf46de93fc9e018499be96dbe57625ddfc
2021-05-28 16:05:15 +00:00
TreeHugger Robot
5f6f37a889
Merge "Update battery defender tip string" into sc-dev am: 029edb7c48
am: a25ffb5ba9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710
Change-Id: Ib83a0db2d5fac3688ae4d3de35ce320bfed34de4
2021-05-28 16:02:19 +00:00
TreeHugger Robot
a4391091b1
Merge "Fix the color problem at top/bottom border when page transition" into sc-dev am: 072bf553fe
am: 286ed10432
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733204
Change-Id: I77b1f81af2e896d976b54a6c4154c9cb3883303a
2021-05-28 04:06:34 +00:00
TreeHugger Robot
8b201e4d3e
Merge "Hide "Add link" item when have no addable items" into sc-dev am: 7ffd89ed06
am: 7425f30a21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732238
Change-Id: I4a356690231a727c7072d28be2bae5f98a9d7b80
2021-05-28 04:06:17 +00:00
TreeHugger Robot
286ed10432
Merge "Fix the color problem at top/bottom border when page transition" into sc-dev am: 072bf553fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733204
Change-Id: I9a5e88fb2fcd09688941967d866191747339f765
2021-05-28 03:44:13 +00:00
TreeHugger Robot
7425f30a21
Merge "Hide "Add link" item when have no addable items" into sc-dev am: 7ffd89ed06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732238
Change-Id: Ifa521f727c712ba22a9791028d3a4eb4a4f7a68b
2021-05-28 03:44:05 +00:00
TreeHugger Robot
033421f680
Merge "Fix NPE at Storage Settings configuration change" into sc-dev am: aab74b24c0
am: faf84a3cd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733201
Change-Id: Ia6495e6eb9bbffc8f093e987639b0635e6f6336c
2021-05-28 03:31:17 +00:00
TreeHugger Robot
704b9458c0
Merge "Shows trash category in Storage Settings" into sc-dev am: 90c29cf014
am: 28544e66b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702754
Change-Id: I2c6178b5ab52372e503154b098e3f763731a0ac8
2021-05-28 03:31:12 +00:00
TreeHugger Robot
da3856cf2d
Merge "Fix [AR] - Icons are slightly overlapping adjacent text in the Allow Accessibility demo" into sc-dev am: f2d23213b3
am: 0e03fd2480
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733200
Change-Id: Id32bdc793dfbd747bc4e44f539bd252c4bf126df
2021-05-28 03:31:06 +00:00
menghanli
4ec5edef67
Fix Magnification shortcut option content overlap with top and bottom dialog container am: ccc8a93c6c
am: 9fadbe0324
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702393
Change-Id: I028d4e1121f925ef5e292e9f5d76249ae36f1c72
2021-05-28 03:30:59 +00:00
TreeHugger Robot
f6bd155c98
Merge "Fix LocationSetttingsFooter robotests" into sc-dev am: 2bc0aa5537
am: d5f9f645c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14749031
Change-Id: I7a62589e877d443db300dd281fd9bcc08b2616b1
2021-05-28 03:30:55 +00:00
TreeHugger Robot
68fa890bc6
Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083
am: 1a79c0a26d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398
Change-Id: I084e79d4ae1eaf1b42b59e483354cb6391c01f36
2021-05-28 03:30:45 +00:00
TreeHugger Robot
606ec1ca33
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07b7a97ce8
-s ours am: 00d51f35f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740734
Change-Id: I116583a1c3cf8e73391694cc682185592cabb503
2021-05-28 03:30:39 +00:00
TreeHugger Robot
d9ca0e2b5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7
-s ours am: c6e8fc4459
-s ours am: 3961f4cd99
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740730
Change-Id: I445fad39f0001c28d3d93bf313e1f799e9e8e56a
2021-05-28 03:30:09 +00:00
Bill Yi
dbbf25f80d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe
-s ours am: 3f0263ce7f
-s ours am: ca41176024
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740620
Change-Id: I6227759631978589917d900f482df70518d8d4fc
2021-05-28 03:29:06 +00:00
TreeHugger Robot
072bf553fe
Merge "Fix the color problem at top/bottom border when page transition" into sc-dev
2021-05-28 03:23:02 +00:00
TreeHugger Robot
7ffd89ed06
Merge "Hide "Add link" item when have no addable items" into sc-dev
2021-05-28 03:21:42 +00:00
TreeHugger Robot
faf84a3cd2
Merge "Fix NPE at Storage Settings configuration change" into sc-dev am: aab74b24c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733201
Change-Id: Ice99d90d0aa2969d1d89f92682ae4c21d8d54685
2021-05-28 03:05:50 +00:00
TreeHugger Robot
28544e66b2
Merge "Shows trash category in Storage Settings" into sc-dev am: 90c29cf014
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702754
Change-Id: Ie0629acef005da53d4a76b128bf58378989bb070
2021-05-28 03:05:45 +00:00
TreeHugger Robot
0e03fd2480
Merge "Fix [AR] - Icons are slightly overlapping adjacent text in the Allow Accessibility demo" into sc-dev am: f2d23213b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733200
Change-Id: Ie5cfe912a202f4c557d12d2343d0fd7dec0e9fef
2021-05-28 03:05:40 +00:00
menghanli
9fadbe0324
Fix Magnification shortcut option content overlap with top and bottom dialog container am: ccc8a93c6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702393
Change-Id: If9d5b907d4192a74ac9263c6f4511d6e7349d34a
2021-05-28 03:05:35 +00:00
TreeHugger Robot
d5f9f645c3
Merge "Fix LocationSetttingsFooter robotests" into sc-dev am: 2bc0aa5537
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14749031
Change-Id: I7018ef909bd6d67fcf83b86fe3a116d4a0902f5d
2021-05-28 03:05:31 +00:00
TreeHugger Robot
1a79c0a26d
Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398
Change-Id: Ia4d3be59a713405159191f391aef3f855b593083
2021-05-28 03:05:25 +00:00
TreeHugger Robot
00d51f35f2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07b7a97ce8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740734
Change-Id: Ia17ba8c86e99f2cbd0db00fdb9f387655985acd8
2021-05-28 03:05:18 +00:00
TreeHugger Robot
3961f4cd99
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7
-s ours am: c6e8fc4459
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740730
Change-Id: I49ac7f4af71c7cac12fe84b436c964c8f6154301
2021-05-28 03:04:54 +00:00
Bill Yi
ca41176024
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe
-s ours am: 3f0263ce7f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740620
Change-Id: I863cfafd3c617c662d1fdab913bcff847e6e5617
2021-05-28 03:04:35 +00:00
TreeHugger Robot
a146ba8797
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895
-s ours am: 197a03a9de
-s ours am: 18684c37cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740732
Change-Id: I1fe916646107b4526d6a761da26be0f85c3c5973
2021-05-28 02:58:57 +00:00
Bill Yi
c51ddfc7ef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84
-s ours am: 332a439d60
-s ours am: 9b1dc74d75
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740731
Change-Id: I9bd16588b3717d5ae30cc8b91fc5013799c9e62a
2021-05-28 02:58:35 +00:00
TreeHugger Robot
18684c37cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895
-s ours am: 197a03a9de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740732
Change-Id: Ia4b16108472d7951050281a5455ebbb9bb594296
2021-05-28 02:58:22 +00:00
TreeHugger Robot
8b32f523fc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c
-s ours am: 50eba21a6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740737
Change-Id: Ib5e7e5bccbc5a26aeb0f1a4f8b32794c158d7db3
2021-05-28 02:57:18 +00:00
Beth Thibodeau
baf515ee95
Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830
am: b7749fd405
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441
Change-Id: I5abe8f9c14241fd6ee339a66b3380ffcf3959a7a
2021-05-28 02:56:16 +00:00
Betty Chang
58e10e06c3
Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48
am: 8fdf4774b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646
Change-Id: Id87b97cb260d45d606f67495c42609464d8ce5c1
2021-05-28 02:56:06 +00:00
Kevin Chyn
a0adbe1918
Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6
am: e6eb1020f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437
Change-Id: If9d9caeebfb36ae47b8f1836433f71b004fa5f13
2021-05-28 02:55:59 +00:00
Bill Yi
9b1dc74d75
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84
-s ours am: 332a439d60
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740731
Change-Id: I48bccc432fdc813a96bc2ba99ab4053861601f6a
2021-05-28 02:53:36 +00:00
TreeHugger Robot
d799e4332b
Merge "Update battery defender tip string" into sc-dev am: 029edb7c48
am: 509a09653b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710
Change-Id: Ie16aa71fa0894495fa0fa773505b4196ebc2141d
2021-05-28 02:53:22 +00:00
TreeHugger Robot
50eba21a6a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740737
Change-Id: I3677657d757665f0419d270d3b2be3eb2ee55b45
2021-05-28 02:51:14 +00:00
Beth Thibodeau
b7749fd405
Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441
Change-Id: I93ad28321bdc880f9fda6c6299cb1b5b60d81cfa
2021-05-28 02:29:54 +00:00
Betty Chang
8fdf4774b4
Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646
Change-Id: Iad8e167b8f9f38b906ceb14cb9a713e8e200c354
2021-05-28 02:29:30 +00:00
Kevin Chyn
e6eb1020f8
Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437
Change-Id: I76b7fff784faa5945717c1ec3d016f7ab57d5ece
2021-05-28 02:29:24 +00:00
TreeHugger Robot
509a09653b
Merge "Update battery defender tip string" into sc-dev am: 029edb7c48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710
Change-Id: Id714cf519433966edd608cb9f62b9d12b7e5d384
2021-05-28 02:24:48 +00:00
TreeHugger Robot
aab74b24c0
Merge "Fix NPE at Storage Settings configuration change" into sc-dev
2021-05-28 02:01:54 +00:00
TreeHugger Robot
90c29cf014
Merge "Shows trash category in Storage Settings" into sc-dev
2021-05-27 23:33:57 +00:00
TreeHugger Robot
f2d23213b3
Merge "Fix [AR] - Icons are slightly overlapping adjacent text in the Allow Accessibility demo" into sc-dev
2021-05-27 22:20:45 +00:00
menghanli
02200d29af
Fix [AR] - Icons are slightly overlapping adjacent text in the Allow Accessibility demo
...
Root cause: Use marginRight between icon and text, but it does not work for RTL launguage.
Solution: Use margineEnd instead.
Bug: 189221008
Test: Manual testing
Change-Id: I02d30228c80c95aeb3b875364f2d2cbf76f3664b
2021-05-27 20:31:58 +00:00