Automerger Merge Worker
a6a76a1eb3
Merge "Merge "Logs accessibility service user trigger status." into rvc-dev am: a69eb462a8
am: 7725372140" into rvc-d1-dev-plus-aosp
2020-04-30 12:42:25 +00:00
Automerger Merge Worker
50acad631c
Merge "Merge "A new ui flow for screen pinning feature" into rvc-dev am: 8da9374ace
am: 2935ac8e93" into rvc-d1-dev-plus-aosp
2020-04-30 12:42:20 +00:00
Jason Hsu
26b3f3b9cc
Merge "Logs accessibility service user trigger status." into rvc-dev am: a69eb462a8
am: 7725372140
...
Change-Id: I68a485b26308f3ee10d066caaf3ddc4af1eb68c9
2020-04-30 12:42:18 +00:00
TreeHugger Robot
db06196030
Merge "A new ui flow for screen pinning feature" into rvc-dev am: 8da9374ace
am: 2935ac8e93
...
Change-Id: Ief805f3efdbdfd293cea6621695652367b55905d
2020-04-30 12:42:15 +00:00
TreeHugger Robot
a382556868
Merge "A new ui flow for screen pinning feature" into rvc-dev am: 8da9374ace
am: b97b9a1906
...
Change-Id: I3cd0d36311a66624ae16f26672081f48f4ecadcd
2020-04-30 12:42:10 +00:00
Automerger Merge Worker
527bad10ff
Merge "Merge "Add icons to contextual Wi-Fi card header" into rvc-dev am: c4310e5980
am: 9a4a80aa19" into rvc-d1-dev-plus-aosp
2020-04-30 12:42:04 +00:00
TreeHugger Robot
8e2eb354b7
Merge "Add icons to contextual Wi-Fi card header" into rvc-dev am: c4310e5980
am: 9a4a80aa19
...
Change-Id: I9f78252ec89180816058177dbfc390cc15e19219
2020-04-30 12:42:00 +00:00
TreeHugger Robot
2e7c4dff34
Merge "Add icons to contextual Wi-Fi card header" into rvc-dev am: c4310e5980
am: caf9a77274
...
Change-Id: Ia2618778e6cd3f5e7bb62913a826a78c0038e3f0
2020-04-30 12:41:58 +00:00
Jason Hsu
7725372140
Merge "Logs accessibility service user trigger status." into rvc-dev am: a69eb462a8
...
Change-Id: I4d1770975ed6dc6f66fe1fd1b07869c36e754e70
2020-04-30 12:32:04 +00:00
TreeHugger Robot
b97b9a1906
Merge "A new ui flow for screen pinning feature" into rvc-dev am: 8da9374ace
...
Change-Id: Ib6dc8fe0cc36ddce8249e00af7a57664853afdb3
2020-04-30 12:31:26 +00:00
TreeHugger Robot
2935ac8e93
Merge "A new ui flow for screen pinning feature" into rvc-dev am: 8da9374ace
...
Change-Id: Ia3a3e56e4e7ec265beb11522d5cc138da8c4851a
2020-04-30 12:31:15 +00:00
TreeHugger Robot
caf9a77274
Merge "Add icons to contextual Wi-Fi card header" into rvc-dev am: c4310e5980
...
Change-Id: I56e83fcc0c72387880d9ce2bc0dc5f336bcb79d9
2020-04-30 12:31:12 +00:00
TreeHugger Robot
9a4a80aa19
Merge "Add icons to contextual Wi-Fi card header" into rvc-dev am: c4310e5980
...
Change-Id: I5319acc112a0bf710b880ee19b24c5846c8388ec
2020-04-30 12:31:06 +00:00
Jason Hsu
a69eb462a8
Merge "Logs accessibility service user trigger status." into rvc-dev
2020-04-30 12:21:16 +00:00
TreeHugger Robot
8da9374ace
Merge "A new ui flow for screen pinning feature" into rvc-dev
2020-04-30 12:09:54 +00:00
TreeHugger Robot
c4310e5980
Merge "Add icons to contextual Wi-Fi card header" into rvc-dev
2020-04-30 12:08:54 +00:00
Automerger Merge Worker
0ad6a5f19f
Merge "Merge "Refine contextual Bluetooth card behavior when Bluetooth is off" into rvc-dev am: 5b260b0bd1
am: 71953e7475" into rvc-d1-dev-plus-aosp
2020-04-30 11:17:38 +00:00
Jason Chiu
153a180376
Merge "Refine contextual Bluetooth card behavior when Bluetooth is off" into rvc-dev am: 5b260b0bd1
am: 71953e7475
...
Change-Id: I246c4080078f32851b95203741d1b3549b37b7ea
2020-04-30 11:17:34 +00:00
Jason Chiu
f2af47b09a
Merge "Refine contextual Bluetooth card behavior when Bluetooth is off" into rvc-dev am: 5b260b0bd1
am: e2c798b8a7
...
Change-Id: I2d72e47c70fe54ad37fcfb2fe25021f42fba5834
2020-04-30 11:17:24 +00:00
Jason Chiu
71953e7475
Merge "Refine contextual Bluetooth card behavior when Bluetooth is off" into rvc-dev am: 5b260b0bd1
...
Change-Id: I2323581dd6f6b3836b43fc494fc42fe45da10752
2020-04-30 10:57:08 +00:00
Jason Chiu
e2c798b8a7
Merge "Refine contextual Bluetooth card behavior when Bluetooth is off" into rvc-dev am: 5b260b0bd1
...
Change-Id: I7da9e14073cd3e153f2b06432cf85fbe1ae1ff00
2020-04-30 10:57:07 +00:00
Jason Chiu
5b260b0bd1
Merge "Refine contextual Bluetooth card behavior when Bluetooth is off" into rvc-dev
2020-04-30 10:44:06 +00:00
Jason Chiu
509c0119fb
Add icons to contextual Wi-Fi card header
...
Fixes: 149666241
Test: robotest
Change-Id: I67076eb561bc496b272b28dc54bce8845d8d622f
2020-04-30 18:34:33 +08:00
Tsung-Mao Fang
ae661a0782
A new ui flow for screen pinning feature
...
The purpose of this change is to resolve a number of security issue
around screen pinning.
See more detail go/screen-pinning-allows
There're a few change for Settings app.
- Rename the screen pinning to app pinning.
- Change the string description for app pinning.
- Pop up a warning dialog while user is enabling this feature.
Test: Rebuilt rom and see new ui flow.
Bug: 151332926
Change-Id: Ife07d7b95ab5dccb2aed7f2bc8fa32f97763bd63
2020-04-30 17:28:05 +08:00
TreeHugger Robot
386ce3d1eb
Merge "Twilight Location off text" into rvc-dev am: 136c101001
am: 2c53128d9d
...
Change-Id: If139f5aafcf8d6dabfed73dc941955949e9f43aa
2020-04-30 04:59:03 +00:00
TreeHugger Robot
d797c923e2
Merge "Twilight Location off text" into rvc-dev am: 136c101001
am: 1b942d4d92
...
Change-Id: I6c6efffcb0537e343c117cb9ddb4c641a3b6dd4f
2020-04-30 04:58:35 +00:00
TreeHugger Robot
2c53128d9d
Merge "Twilight Location off text" into rvc-dev am: 136c101001
...
Change-Id: I20b97e1cb34ce75757da58cad8440ba4d4f77d39
2020-04-30 04:48:47 +00:00
TreeHugger Robot
1b942d4d92
Merge "Twilight Location off text" into rvc-dev am: 136c101001
...
Change-Id: I69126f622ed425ce97d1ddc3937afa5b55d72e9e
2020-04-30 04:48:36 +00:00
TreeHugger Robot
bec28bb63a
Merge "Add "Play <APP> to" string" into rvc-dev am: 9fd2ebf9ea
am: 70f3a1855e
...
Change-Id: Ic21aeca7696939864726970b608077cc6e1a8314
2020-04-30 04:34:49 +00:00
TreeHugger Robot
136c101001
Merge "Twilight Location off text" into rvc-dev
2020-04-30 04:34:42 +00:00
TreeHugger Robot
c5f7bb9495
Merge "Add "Play <APP> to" string" into rvc-dev am: 9fd2ebf9ea
am: 2712b5b0b3
...
Change-Id: I34528a9490e3fb3ebcc2a519b1ae10d9db9c1d37
2020-04-30 04:34:35 +00:00
TreeHugger Robot
2712b5b0b3
Merge "Add "Play <APP> to" string" into rvc-dev am: 9fd2ebf9ea
...
Change-Id: I8f0e37d66d1cd6956611ffd12943bb1e0dc4a59f
2020-04-30 04:20:47 +00:00
TreeHugger Robot
70f3a1855e
Merge "Add "Play <APP> to" string" into rvc-dev am: 9fd2ebf9ea
...
Change-Id: Id500f0c233cf861ef844fd0187542c5f7bc3b862
2020-04-30 04:20:00 +00:00
TreeHugger Robot
9fd2ebf9ea
Merge "Add "Play <APP> to" string" into rvc-dev
2020-04-30 04:10:39 +00:00
Blake Kragten
d361ccdc34
Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev am: 6fe60521d1
am: d328f9c80d
...
Change-Id: I32a4c405930b28711d235f1feafb6dea6681ee9a
2020-04-30 04:03:09 +00:00
Blake Kragten
a6c32c6a41
Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev am: 6fe60521d1
am: ba264a325f
...
Change-Id: I538ba9a0d1b62eb720621de79b1b515bdf02c25f
2020-04-30 03:54:45 +00:00
Treehugger Robot
071beb9544
[automerger skipped] Merge changes I6194592d,I5a02f847 am: 44146c8e3b
am: ebea74264a
-s ours am: 37ee14a792
-s ours
...
am skip reason: Change-Id I6194592d9a7bf4d4b7993fc344d7392bf5c296aa with SHA-1 c67a0d853b
is in history
Change-Id: I51f80b9e2eb590cf9a5b7567980ae85a96a2d17b
2020-04-30 03:54:31 +00:00
Malcolm Chen
67a9e9b3cf
[automerger skipped] Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f
am: b6fa2277f6
-s ours am: 38687bab76
-s ours
...
am skip reason: Change-Id I5a02f847531988217cc6ab47e3b35ed319c1027c with SHA-1 80be9de6d0
is in history
Change-Id: I25a3a7d37dcd3d15ec53a287d01961ee78423268
2020-04-30 03:54:29 +00:00
Blake Kragten
ba264a325f
Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev am: 6fe60521d1
...
Change-Id: I057a92706e916b54ee5caa4780ec8471c8cb17e9
2020-04-30 03:48:08 +00:00
Blake Kragten
d328f9c80d
Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev am: 6fe60521d1
...
Change-Id: I9527c519a2daa31ae79a0c3d3ea6f5ccbbca492b
2020-04-30 03:46:56 +00:00
Treehugger Robot
37ee14a792
[automerger skipped] Merge changes I6194592d,I5a02f847 am: 44146c8e3b
am: ebea74264a
-s ours
...
am skip reason: Change-Id I6194592d9a7bf4d4b7993fc344d7392bf5c296aa with SHA-1 c67a0d853b
is in history
Change-Id: I3e9b8218b9ad4fdeb4b7d91b66f66881344b5036
2020-04-30 03:33:51 +00:00
Malcolm Chen
38687bab76
[automerger skipped] Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f
am: b6fa2277f6
-s ours
...
am skip reason: Change-Id I5a02f847531988217cc6ab47e3b35ed319c1027c with SHA-1 80be9de6d0
is in history
Change-Id: I2151c3c3abe64328ef6f69adade622fb7b9700b5
2020-04-30 03:33:49 +00:00
Blake Kragten
6fe60521d1
Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev
2020-04-30 03:24:52 +00:00
Treehugger Robot
ebea74264a
Merge changes I6194592d,I5a02f847 am: 44146c8e3b
...
Change-Id: I2ebc5edd89fb32b2698c8cfd6acb20342c9cec17
2020-04-30 03:17:19 +00:00
Malcolm Chen
b6fa2277f6
Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f
...
Change-Id: I3377b9cbc1d4722a8a96c18f40d1118e476c4ef7
2020-04-30 03:17:16 +00:00
Jay Aliomer
41ee5663ab
Twilight Location off text
...
When location is disabled, dark theme and night light
will show text and button to take the user to location page
Fixes: 153115261
Fixes: 153115618
Test: manually turn off location and observe view
Change-Id: I24be2f26a4c9e1b3f2a17e83e6f91cb7685f2e28
2020-04-29 23:14:32 -04:00
Treehugger Robot
44146c8e3b
Merge changes I6194592d,I5a02f847
...
* changes:
Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
Define a helper link for 5G limitation in DSDS footer.
2020-04-30 02:56:34 +00:00
Tim Peng
be4ed2a3cb
Add "Play <APP> to" string
...
Bug: 155345595
Test: build pass
Change-Id: Ib656f0db2efa6f777ada2c2565493775e72634ae
2020-04-30 02:13:24 +00:00
TreeHugger Robot
4539d41abc
Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84
am: 7a41660242
...
Change-Id: I12983c2ed072beec2082bd671b35602663437e63
2020-04-29 23:29:41 +00:00
TreeHugger Robot
7c24739c48
Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84
am: 9e4e794f09
...
Change-Id: Ibfec3437d07726fda09d4cf4a8976356965930d3
2020-04-29 23:29:05 +00:00