TreeHugger Robot
7eeaa28b0b
Merge "Adjust layout of Display Settings" into sc-dev am: 42af840f68
am: e6683b32d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758071
Change-Id: I9c74ce1fb93272da14e13131642f3c644fcc3e41
2021-05-31 03:16:42 +00:00
TreeHugger Robot
e6683b32d1
Merge "Adjust layout of Display Settings" into sc-dev am: 42af840f68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758071
Change-Id: If8cbc3a7b6302cff127ede4363e270a3387d2615
2021-05-31 03:06:58 +00:00
TreeHugger Robot
42af840f68
Merge "Adjust layout of Display Settings" into sc-dev
2021-05-31 03:00:19 +00:00
Menghan Li
6b5d83b136
Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev am: 302fb36121
am: 5308b0988e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732240
Change-Id: Ie3c2c0eb72357e1a92bfa18c8510a0f40a27f4b3
2021-05-31 02:55:48 +00:00
TreeHugger Robot
ac532d7c78
Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c
am: f109e61463
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192
Change-Id: I742e740f484c1e3c0ac55f018a783a2c8d27b4f9
2021-05-31 02:55:43 +00:00
Menghan Li
5308b0988e
Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev am: 302fb36121
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732240
Change-Id: Ie8e58ca447fda3a89a32487aa7c880ce06a01ecf
2021-05-31 02:55:38 +00:00
Menghan Li
caac0d6c6c
Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev am: 302fb36121
am: 2f9ec68cbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732240
Change-Id: Ie5b5a1d52acc1fd21f9613ac6af4947aa8f7bfb3
2021-05-31 02:55:38 +00:00
TreeHugger Robot
e24f7faeab
Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f
am: 13c9e78d57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198
Change-Id: I3d717162274583eb24cdaa49fbb97ae6df4ed6a8
2021-05-31 02:54:39 +00:00
Menghan Li
2f9ec68cbf
Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev am: 302fb36121
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732240
Change-Id: I214a693021cdd4f090048e3905d8a8c56b931233
2021-05-31 02:48:39 +00:00
TreeHugger Robot
c3cc642534
Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c
am: 3127f05be9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192
Change-Id: I87ade63d05a3ceca810d0c6d804034aaf24454ca
2021-05-31 02:45:56 +00:00
TreeHugger Robot
79d458d3f5
Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f
am: 4d1c81ac07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198
Change-Id: I9baa4f92386b3ea7ce57fbd4a5c57dc5c79c81e7
2021-05-31 02:44:50 +00:00
Menghan Li
302fb36121
Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev
2021-05-31 02:44:12 +00:00
TreeHugger Robot
3127f05be9
Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192
Change-Id: I5ca9dd413db7d8254b80e33a99fdefba9e1f264d
2021-05-31 02:42:02 +00:00
TreeHugger Robot
f109e61463
Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192
Change-Id: Iad0a485118eb586ef180b687e7c0054796122608
2021-05-31 02:32:22 +00:00
TreeHugger Robot
13c9e78d57
Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198
Change-Id: I40825b1b3dec4e50ecd0ef8974835f25e389cffa
2021-05-31 02:32:16 +00:00
TreeHugger Robot
88346ce71c
Merge "Update Policy transparency dialog layout" into sc-dev
2021-05-31 02:29:53 +00:00
TreeHugger Robot
4d1c81ac07
Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198
Change-Id: I44e3d8aced8c47621931bd7185632cc4527d29b2
2021-05-31 02:25:56 +00:00
TreeHugger Robot
bc587c4d1f
Merge "Fix bluetooth pairing notification could not be removed" into sc-dev
2021-05-31 02:07:17 +00:00
TreeHugger Robot
97a4c0feba
Merge "Fix the color problem at top/bottom border when page transition" into sc-dev am: 072bf553fe
am: f8f435397c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733204
Change-Id: I4736c25b5da77416490ca0d0a25e0de656321f14
2021-05-28 16:33:05 +00:00
TreeHugger Robot
0401b8c829
Merge "Hide "Add link" item when have no addable items" into sc-dev am: 7ffd89ed06
am: 8ebc54161d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732238
Change-Id: I711e66e96abc52fdb8520282bf39d296a16c472f
2021-05-28 16:33:01 +00:00
TreeHugger Robot
04c08d5a7e
Merge "Fix NPE at Storage Settings configuration change" into sc-dev am: aab74b24c0
am: 1311cf8f80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733201
Change-Id: Id0d156cbd9996f6c44450c305ec71b851a340893
2021-05-28 16:32:58 +00:00
TreeHugger Robot
22b7e1a66e
Merge "Shows trash category in Storage Settings" into sc-dev am: 90c29cf014
am: 6124c8475c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702754
Change-Id: Ia82a7e92ed5fc6b6d60a7eb765bc27cac9cde540
2021-05-28 16:32:54 +00:00
TreeHugger Robot
755eba4304
Merge "Fix [AR] - Icons are slightly overlapping adjacent text in the Allow Accessibility demo" into sc-dev am: f2d23213b3
am: 5d9744e7de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733200
Change-Id: I7737e87bdbb409e8adc637ffb070294889c27ebb
2021-05-28 16:32:49 +00:00
menghanli
90bf05e1cd
Fix Magnification shortcut option content overlap with top and bottom dialog container am: ccc8a93c6c
am: 4e99d76b6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702393
Change-Id: Iafc5742139dccacac5619718a11e47b2e240d755
2021-05-28 16:32:44 +00:00
TreeHugger Robot
ededd36ab7
Merge "Fix LocationSetttingsFooter robotests" into sc-dev am: 2bc0aa5537
am: a80a4e78c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14749031
Change-Id: I5b1d6ddd2e77bd29bc36e70cdeff0c838343ad44
2021-05-28 16:32:41 +00:00
TreeHugger Robot
a977eff538
Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083
am: 57320e6019
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398
Change-Id: I037daad324f870b2f94a32947a0e5d9e06c8a8cc
2021-05-28 16:32:36 +00:00
TreeHugger Robot
fd90cf6ed5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07b7a97ce8
-s ours am: 8018d4b2a8
-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: I2541d1b98f101272cae7d97b6d9150aa829e5c73
2021-05-28 16:32:32 +00:00
TreeHugger Robot
448cd13999
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7
-s ours am: c6e8fc4459
-s ours am: 3c3bcfe1be
-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: Id32082bac226f352d2de27ad7e00838b4fac2b0d
2021-05-28 16:32:25 +00:00
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
Edgar Wang
71ca31cbac
Adjust layout of Display Settings
...
- Move TopIntroPreference up in Dark theme settings
- Move TopIntroPreference up in Night Light settings
- Move MainSwitchPreference under Illustaction in Adaptive brightness
Bug: 189390264
Bug: 189389913
Bug: 189384967
Test: visual verify
Change-Id: I32ba5bf94dfca705739994dc27d97f0d9caaad50
2021-05-28 14:03:10 +08: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
f8f435397c
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: I1147d58e23f8ee423f52a89904e7ea8d32e6faaf
2021-05-28 03:52:52 +00:00
TreeHugger Robot
8ebc54161d
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: I36f0b56ac6b0e02a8e55fce3f443c0c33d7ffdf4
2021-05-28 03:52:45 +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