Commit Graph

71437 Commits

Author SHA1 Message Date
mincheli
8af733e95d Removes magnification enable preference
Magnification enable preference is obsoleted and should be removed
because magnification button is applied in system UI recently.

Bug: 146473544
Test: make RunSettingsRoboTests
Change-Id: I24542cdfa68eec2cc0c9fb1a633b3ccdd3f9546d
2020-06-04 05:53:24 +00:00
TreeHugger Robot
392490cc3c Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 am: d3d9b3d462 am: 0e3478902e am: 6509f8f6cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I28fba10e89df72607d73d8511ed40ba23fb85783
2020-06-04 05:16:38 +00:00
TreeHugger Robot
a2263a1867 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 am: 85a4217776 am: b65929d5e1 am: 82142b77b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I2c796da50d8d0b8aa9f3e3f26a6cfb38f7079a8e
2020-06-04 05:16:30 +00:00
TreeHugger Robot
cb2f7e0c66 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 am: d3d9b3d462 am: 270646dbe1 am: b29970c5f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I7b4f907acd4b747bbfe44079135edb9dcf9dea94
2020-06-04 05:16:20 +00:00
TreeHugger Robot
6509f8f6cf Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 am: d3d9b3d462 am: 0e3478902e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I90f3d8ba4c6ba32c3a2485492fc7ff3b72316123
2020-06-04 05:03:16 +00:00
TreeHugger Robot
82142b77b4 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 am: 85a4217776 am: b65929d5e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: Ifd23155bd760f3ede0b260d77c85ddcb153eab80
2020-06-04 05:03:01 +00:00
TreeHugger Robot
b29970c5f4 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 am: d3d9b3d462 am: 270646dbe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I615b0c587448e890eafc5ffc3fafa02f806822e9
2020-06-04 05:02:47 +00:00
TreeHugger Robot
b65929d5e1 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 am: 85a4217776
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: Ib4999548d747e284ccc0844ad4a117cbb402f92f
2020-06-04 04:48:49 +00:00
TreeHugger Robot
270646dbe1 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 am: d3d9b3d462
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I7abcc9e2109bf66e00b14bd8d72457622e392643
2020-06-04 04:48:36 +00:00
TreeHugger Robot
0e3478902e Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 am: d3d9b3d462
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: Ic9a962c4f5256fe4c68becdc7ca23609b6633b15
2020-06-04 04:48:35 +00:00
TreeHugger Robot
85a4217776 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I5d84c6b9d0b143bdce1fad1a2cc248c5f13f986d
2020-06-04 04:38:58 +00:00
TreeHugger Robot
d3d9b3d462 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I4c84d1e4c7f16fd85d8c8af15cd0e92e62dd6439
2020-06-04 04:38:53 +00:00
TreeHugger Robot
74755ac915 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev 2020-06-04 04:24:55 +00:00
Will Brockman
b8440d9763 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 5d859ea300 am: a52b40c170 am: afe0fdaafc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: Id997509ab4d71ad16c7269d40d19c12484877461
2020-06-03 18:46:02 +00:00
Will Brockman
4055c0fa50 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 815dac6ce0 am: 63bb9a404f am: c5f92b8a0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: Ib49258c844f2cbd3aad5a1a956aad535e284645c
2020-06-03 18:44:47 +00:00
Will Brockman
afe0fdaafc Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 5d859ea300 am: a52b40c170
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: Id9ef851baeb334840315e15c983bb5dd1d878e37
2020-06-03 18:28:22 +00:00
Will Brockman
c5f92b8a0d Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 815dac6ce0 am: 63bb9a404f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I252fafea4035a0c96c7768ecca01e4f2b4b93b7f
2020-06-03 18:24:32 +00:00
Will Brockman
91d83cf9a0 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 5d859ea300 am: 58af569f66 am: 55db3402b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: Ia4377d3929888c1df13b01d2cf6e72e82067e96d
2020-06-03 18:21:22 +00:00
TreeHugger Robot
01f24c2bf5 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 455227793c am: 9f9631b7ce am: 6901b26c20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: Ifa500379c067d54425dc8d2ca90d7a0cb6033b51
2020-06-03 18:16:40 +00:00
TreeHugger Robot
35fceb1cc8 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11 am: cc0f307449 am: 2b3f033d5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I4872dfc1843d82558e247199dedaa88fa12a3630
2020-06-03 18:16:24 +00:00
TreeHugger Robot
3257a4448c Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11 am: 0d6dcbb507 am: 56001a89de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I17314de42a730b2c902abf2a9791b8c5bdcee3e0
2020-06-03 18:15:57 +00:00
Will Brockman
55db3402b8 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 5d859ea300 am: 58af569f66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I8b5b547cce6f804d062e9518e2a0b9712cdf071a
2020-06-03 18:13:58 +00:00
Will Brockman
a52b40c170 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 5d859ea300
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I0f9c8ac84872b7e88c860e3033b1aac81d7a127e
2020-06-03 18:01:01 +00:00
Will Brockman
63bb9a404f Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 815dac6ce0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I413de4bd9af640533e9be5e57af1ff00af2237b8
2020-06-03 18:00:11 +00:00
Will Brockman
58af569f66 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d am: 5d859ea300
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I378c3f2dc0a42ab38332c16a29542a3691636670
2020-06-03 17:59:46 +00:00
Will Brockman
815dac6ce0 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I6ad5bfd54a1a0d52f6207c103adc5808f60365f8
2020-06-03 17:58:37 +00:00
Will Brockman
5d859ea300 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I93a6ace5ceab0cf0b0794c8a241e99d301f07cb1
2020-06-03 17:58:02 +00:00
TreeHugger Robot
6901b26c20 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 455227793c am: 9f9631b7ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I8da7eded5d541ac9ed9422e99902985f5fdadd46
2020-06-03 17:57:55 +00:00
TreeHugger Robot
2b3f033d5e Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11 am: cc0f307449
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I384e3f406fc07e1683b5302e56cacb0829e9e92f
2020-06-03 17:56:35 +00:00
TreeHugger Robot
56001a89de Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11 am: 0d6dcbb507
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I06ba7876590b6ec81d8f19f269df3bdce7fcf177
2020-06-03 17:56:19 +00:00
Will Brockman
5c1b9c357d Merge "Statsd UiEvent logging for notification history." into rvc-dev 2020-06-03 17:55:47 +00:00
Xin Li
729c213fb7 Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: I614914b738e3af198fe21b881d2e475e2e8eda41
Change-Id: Idd585020a1fed163866339c09d614dca0ca6e55f
2020-06-03 10:45:09 -07:00
TreeHugger Robot
9f9631b7ce Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 455227793c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: Idbda613b47fd4ba3e81e45ddb0fc50a77630e78d
2020-06-03 17:37:09 +00:00
TreeHugger Robot
0d6dcbb507 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I6d504aab02bfd00ad3943d4b1ea82fc32feab92e
2020-06-03 17:36:41 +00:00
TreeHugger Robot
cc0f307449 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58 am: 221f9b4c11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: I541a0150eff40fb07ef8263e8c510f869a9306cb
2020-06-03 17:36:41 +00:00
TreeHugger Robot
455227793c Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: Iae49b6d19752166dd0e1c2ba478625bc40b7aa1f
2020-06-03 17:23:14 +00:00
TreeHugger Robot
221f9b4c11 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev am: 4bb32b6c58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11710365

Change-Id: Ic2e1d889afacc4948360d04cef90188c600fd9c1
2020-06-03 17:23:08 +00:00
TreeHugger Robot
4bb32b6c58 Merge "Add cross profile apps entry in the privacy screen" into rvc-dev 2020-06-03 17:11:45 +00:00
TreeHugger Robot
090988f05c Merge "Import translations. DO NOT MERGE" 2020-06-03 15:49:49 +00:00
TreeHugger Robot
b0c04f161b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb -s ours am: f8c3f387e0 -s ours am: c1f864d0d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1495b5973f2a3afb195da876c1e11c22266e021
2020-06-03 15:27:30 +00:00
TreeHugger Robot
ca6fc9a894 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: b57c537dde -s ours am: f900d3a3ac -s ours am: 9ef01930d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad111241a9c573598992c8b8c48de4451a013e65
2020-06-03 15:27:07 +00:00
TreeHugger Robot
357967b10e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593 -s ours am: b200003ca0 -s ours am: 63708efa4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic33ab5a7ac6827bf1e6c71220da669af3156c130
2020-06-03 15:25:09 +00:00
Automerger Merge Worker
2a3d5fb52b Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: 83d07425f4 -s ours" into rvc-d1-dev-plus-aosp am: a1ce22e1e0 -s ours am: 6f15ea7182 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib18fee053f5fc1e4e9d16d8cee54b2ffec4158b4
2020-06-03 15:25:03 +00:00
TreeHugger Robot
c521747613 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb -s ours am: 6fa00750af -s ours am: 2c01363040 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99a13a962c4a88f7389b926166c804030fe38a2a
2020-06-03 15:24:20 +00:00
TreeHugger Robot
c3185dc8a9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: b57c537dde -s ours am: 14d5d07f76 -s ours am: 07671c3406 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I304fd1fed1211231f1e1b7df100c17ac940f60f1
2020-06-03 15:23:41 +00:00
TreeHugger Robot
5e0e69cb05 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593 -s ours am: 36da31b9e4 -s ours am: 50e08cdbbe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I552c62c4782f4d953eec91370a6769891b0a4d57
2020-06-03 15:23:03 +00:00
TreeHugger Robot
c1f864d0d6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d1620abcfb -s ours am: f8c3f387e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I948370b6f54f36577ac9337752986f1c7c0200db
2020-06-03 15:10:37 +00:00
TreeHugger Robot
9ef01930d1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: b57c537dde -s ours am: f900d3a3ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib671492fd5d11586a5ac94f32d6ced85d5a3ec53
2020-06-03 15:10:20 +00:00
TreeHugger Robot
63708efa4c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ba824d0593 -s ours am: b200003ca0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3bd46968c6c730ec99583283a8354534c6b24ffb
2020-06-03 15:10:13 +00:00
Automerger Merge Worker
6f15ea7182 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14a2 -s ours am: 83d07425f4 -s ours" into rvc-d1-dev-plus-aosp am: a1ce22e1e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f8de6f691b9838aaeadc8c7c97a5e81a3eafbe7
2020-06-03 15:10:05 +00:00