Commit Graph

428495 Commits

Author SHA1 Message Date
Lucas Dupin
453177e631 Merge "Disable bypass if there aren't enrolled faces" into qt-r1-dev am: 9369357e1d
am: 883581f176

Change-Id: Ic7136202d2d3b3ae48c0815e36d1e7a964736d03
2019-06-05 15:37:51 -07:00
Govinda Wasserman
de17732181 Merge "Refactors logging into its own function" into qt-r1-dev am: ab6d79eefd
am: 202b070e2b

Change-Id: I91bcb966666a7d6512925e190c19d992fb049f09
2019-06-05 15:31:00 -07:00
Lucas Dupin
883581f176 Merge "Disable bypass if there aren't enrolled faces" into qt-r1-dev
am: 9369357e1d

Change-Id: I2591f861e338dda0d667874103e89c3833f707f8
2019-06-05 15:22:28 -07:00
Govinda Wasserman
202b070e2b Merge "Refactors logging into its own function" into qt-r1-dev
am: ab6d79eefd

Change-Id: I27052fa2790eaf161e1e76dd7763ec0da1b05285
2019-06-05 15:20:20 -07:00
Winson Chung
327dc451ee Merge "Ensure that the IME switcher button is always touchable" into qt-dev am: f106e0a8fa am: c9dbc123ca
am: 52b1251305

Change-Id: I34f317596f1745f5cdd42e8ff163171d45286dd4
2019-06-05 15:11:03 -07:00
Winson Chung
52b1251305 Merge "Ensure that the IME switcher button is always touchable" into qt-dev am: f106e0a8fa
am: c9dbc123ca

Change-Id: Icfef97e30b8c7d95aec8f63244f8e29d8f42cdd7
2019-06-05 14:54:11 -07:00
Winson Chung
c9dbc123ca Merge "Ensure that the IME switcher button is always touchable" into qt-dev
am: f106e0a8fa

Change-Id: I00f6aa22ba7569e3980b1c086ebdf55b1a773911
2019-06-05 14:48:14 -07:00
Winson Chung
f106e0a8fa Merge "Ensure that the IME switcher button is always touchable" into qt-dev 2019-06-05 21:31:32 +00:00
Brian Duddie
cf2ff61cce Merge "Clarify documentation for sensor placement" into qt-dev am: 6e9c0741b5 am: 985f1299cf
am: fc06205561

Change-Id: I0a33e5c0f1a258d729fe06bbb8da6d6e44fa4fe4
2019-06-05 14:06:45 -07:00
Brian Duddie
fc06205561 Merge "Clarify documentation for sensor placement" into qt-dev am: 6e9c0741b5
am: 985f1299cf

Change-Id: Ibb11b813ccd32d6ae986baf0385d7cb4b90e07dd
2019-06-05 14:01:00 -07:00
Brian Duddie
985f1299cf Merge "Clarify documentation for sensor placement" into qt-dev
am: 6e9c0741b5

Change-Id: I56695e9ea76f802b171c47fbb3f2dead651eb697
2019-06-05 13:53:01 -07:00
Fabian Kozynski
8ecf91c123 Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev am: 15e2d7e50b am: e0047318d6
am: 92bee05891

Change-Id: I12be3d657748c6d82e4a8776bce91c6f2876e13b
2019-06-05 13:43:37 -07:00
Julia Reynolds
e94a94d40d Merge "Read the subtext of noti guts field on selection" into qt-dev am: 8ef8577391 am: 09e8873efe
am: 752efb1197

Change-Id: Ibd7bb360a82fc01462fe181140943f56155d8097
2019-06-05 13:40:54 -07:00
TreeHugger Robot
78f1f5a009 Merge "Badging should print compiled platform version" 2019-06-05 20:39:17 +00:00
TreeHugger Robot
6e9c0741b5 Merge "Clarify documentation for sensor placement" into qt-dev 2019-06-05 20:36:42 +00:00
Matt Casey
002914a2e5 Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev am: 92d7f42baa am: 6a07469e23
am: ecf9bb5851

Change-Id: Ib8ddc854f799818fc39d23ead82d37262a2a6032
2019-06-05 13:35:26 -07:00
Lorenzo Colitti
d859a3abe3 Merge "Always prompt for limited connectivity." into qt-dev am: 4a5a129fb2 am: eabf2d0b8d
am: c13520f53e

Change-Id: I2c8273ee923f1deeed05fecb7413ddb9623edbc3
2019-06-05 13:30:06 -07:00
Fabian Kozynski
92bee05891 Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev am: 15e2d7e50b
am: e0047318d6

Change-Id: I95804c928e0baced524d1d8f75bed1fae68e7568
2019-06-05 13:25:11 -07:00
Julia Reynolds
752efb1197 Merge "Read the subtext of noti guts field on selection" into qt-dev am: 8ef8577391
am: 09e8873efe

Change-Id: Ia896f63672aa2f2bd50957aa7de89bdf94583fcf
2019-06-05 13:22:49 -07:00
Matt Casey
ecf9bb5851 Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev am: 92d7f42baa
am: 6a07469e23

Change-Id: I26827273c85818996ba3279047dd8d5615b1e8df
2019-06-05 13:18:57 -07:00
Fabian Kozynski
e0047318d6 Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev
am: 15e2d7e50b

Change-Id: Ia6a7ec214dac0b1f45a1b6f62ccccd6d9988fe23
2019-06-05 13:18:13 -07:00
Julia Reynolds
09e8873efe Merge "Read the subtext of noti guts field on selection" into qt-dev
am: 8ef8577391

Change-Id: Ic2a9f406330053aec127962a96de1390a34fb1ac
2019-06-05 13:15:53 -07:00
Lorenzo Colitti
c13520f53e Merge "Always prompt for limited connectivity." into qt-dev am: 4a5a129fb2
am: eabf2d0b8d

Change-Id: I29e8139e908fc68dd656143a19aa2ef142f9108d
2019-06-05 13:13:24 -07:00
Matt Casey
6a07469e23 Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev
am: 92d7f42baa

Change-Id: I462a25f23c0a993288fd003b0231cebb47c31633
2019-06-05 13:10:48 -07:00
Fabian Kozynski
15e2d7e50b Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev 2019-06-05 20:10:09 +00:00
Julia Reynolds
f61e6617b7 Merge changes Iffe37242,Ib8527138
* changes:
  Use connected boolean as NLS does vs IBinder
  Only log/send broadcasts for changed data
2019-06-05 20:01:23 +00:00
TreeHugger Robot
8ef8577391 Merge "Read the subtext of noti guts field on selection" into qt-dev 2019-06-05 20:00:32 +00:00
Lorenzo Colitti
eabf2d0b8d Merge "Always prompt for limited connectivity." into qt-dev
am: 4a5a129fb2

Change-Id: I41177562415409ec69b9116caa8f3f2cad03b38e
2019-06-05 12:55:31 -07:00
Matt Casey
92d7f42baa Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev 2019-06-05 19:02:35 +00:00
TreeHugger Robot
4a5a129fb2 Merge "Always prompt for limited connectivity." into qt-dev 2019-06-05 18:50:32 +00:00
Xiangyu/Malcolm Chen
29ee58d708 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: b613fec2f8 am: da3dad46d0
am: ebfa265e01

Change-Id: I607436d2f4f9c6beca27086174174cec46dc02f2
2019-06-05 11:49:30 -07:00
Chen Xu
d9f85fc759 [automerger skipped] Merge "Get the resources associated with subid to support MSIM" am: cdbb700fa3 am: 302b8e8cfe -s ours am: e499d9f43c -s ours
am: 4a71793add -s ours
am skip reason: change_id Ib00cfe3640b59db5f971c32741eed999131e67c0 with SHA1 ea6d2b1e1e is in history

Change-Id: I9a1849e4abbfaeffd2822b2f86cc09c64ae5a576
2019-06-05 11:47:09 -07:00
Brian Duddie
086d840d74 Clarify documentation for sensor placement
Update documentation to be in sync with new language added to HAL
interface, which better explains the expected payload, format, and
usage.

Fixes: 133264933
Test: make docs, view HTML
Change-Id: Ib602674d395cb8c8e6431d23b051685c8d172560
2019-06-05 11:44:44 -07:00
Svetoslav Ganov
e963d2973a Merge "Add OWNERS for DeviceConfig" am: 83ea055e8e am: f42291962b am: 413fad031f
am: eaeaf5e182

Change-Id: I1882f1a529c631ee57d64fb568a599bc6d69540f
2019-06-05 11:40:16 -07:00
Brad Ebinger
ce6b28dabe [automerger skipped] Merge "Fix parcelling issue for certain fields." am: 541f01b1bc am: 07eec6e05d -s ours am: acef882e70 -s ours
am: 3adc5d9613 -s ours
am skip reason: change_id I5ab4f5f3fa05ffe837f1a5b5bccfb93df4902574 with SHA1 362d320315 is in history

Change-Id: I2eb08eb3600dbdd9f16c65951bc7ab8e340bfbbb
2019-06-05 11:37:58 -07:00
Youming Ye
f4cfe1ba0b Merge "Add carrier config for conference participants data support" am: 93931ccb81 am: c575a96d53 am: d7fa6f5516
am: f1529a69a6

Change-Id: Iac203351003c8e6d9ceafb4c57203c6181208f4e
2019-06-05 11:35:09 -07:00
Xiangyu/Malcolm Chen
ebfa265e01 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: b613fec2f8
am: da3dad46d0

Change-Id: I3a11c3f541af539ce6014d4003461f57f079beb3
2019-06-05 11:35:01 -07:00
Julia Reynolds
daab21a050 Read the subtext of noti guts field on selection
When using a11y services

Test: manual with Talkback
Bug: 133649570
Change-Id: Id022e47bef9848e4c5237808659531f8d1c0c953
2019-06-05 18:33:38 +00:00
Youming Ye
dc218d7129 Merge "Add carrier config for conference participants data support" into qt-dev-plus-aosp am: 004f06d79a
am: 5b8c28b9c3

Change-Id: I51cec42e282d8d4c48fdd66678e36474ac7b99cf
2019-06-05 11:31:36 -07:00
Richard Uhler
f11df99a30 Merge "Don't send SessionCallbacks for DRY_RUN sessions." into qt-dev am: 183eacab16 am: d6a80a0f72
am: 3366055142

Change-Id: Ie27e73bd81a8a52b7ab6933fde5a6ca267fbb1e6
2019-06-05 11:28:35 -07:00
Chen Xu
4a71793add [automerger skipped] Merge "Get the resources associated with subid to support MSIM" am: cdbb700fa3 am: 302b8e8cfe -s ours
am: e499d9f43c -s ours
am skip reason: change_id Ib00cfe3640b59db5f971c32741eed999131e67c0 with SHA1 ea6d2b1e1e is in history

Change-Id: I2971b0218b1ca82b63145fda3f9e08e718931e45
2019-06-05 11:27:37 -07:00
Svetoslav Ganov
eaeaf5e182 Merge "Add OWNERS for DeviceConfig" am: 83ea055e8e am: f42291962b
am: 413fad031f

Change-Id: I97de3f3e563f65b2ca0fbbb1897e39ac4fd12035
2019-06-05 11:26:27 -07:00
Brad Ebinger
3adc5d9613 [automerger skipped] Merge "Fix parcelling issue for certain fields." am: 541f01b1bc am: 07eec6e05d -s ours
am: acef882e70 -s ours
am skip reason: change_id I5ab4f5f3fa05ffe837f1a5b5bccfb93df4902574 with SHA1 362d320315 is in history

Change-Id: I3bf7879fc3d5e89ffef654d138549c09c5d1f3bb
2019-06-05 11:24:52 -07:00
Xiangyu/Malcolm Chen
da3dad46d0 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am: b613fec2f8

Change-Id: Ib3b670d0d0709640bd8498259a918357595c07f0
2019-06-05 11:21:23 -07:00
Youming Ye
f1529a69a6 Merge "Add carrier config for conference participants data support" am: 93931ccb81 am: c575a96d53
am: d7fa6f5516

Change-Id: If6bfd6e45b19f2dde2e5c83133ae9f0ff0a40adb
2019-06-05 11:21:22 -07:00
Chen Xu
e499d9f43c [automerger skipped] Merge "Get the resources associated with subid to support MSIM" am: cdbb700fa3
am: 302b8e8cfe -s ours
am skip reason: change_id Ib00cfe3640b59db5f971c32741eed999131e67c0 with SHA1 ea6d2b1e1e is in history

Change-Id: Ic1d323843fd065b527a70df6ff2fff40beb7a8a4
2019-06-05 11:15:08 -07:00
Svetoslav Ganov
413fad031f Merge "Add OWNERS for DeviceConfig" am: 83ea055e8e
am: f42291962b

Change-Id: I051adc8245e6f0740a4d232879ceec7dab7cd7f1
2019-06-05 11:13:49 -07:00
Youming Ye
5b8c28b9c3 Merge "Add carrier config for conference participants data support" into qt-dev-plus-aosp
am: 004f06d79a

Change-Id: Ia0b9b23c25798059715399e234d12ccca8fdacfc
2019-06-05 11:12:33 -07:00
Brad Ebinger
acef882e70 [automerger skipped] Merge "Fix parcelling issue for certain fields." am: 541f01b1bc
am: 07eec6e05d -s ours
am skip reason: change_id I5ab4f5f3fa05ffe837f1a5b5bccfb93df4902574 with SHA1 362d320315 is in history

Change-Id: I1be0d4b86e7f911affd3031363daeb0d10ab8aa2
2019-06-05 11:12:31 -07:00
Youming Ye
d7fa6f5516 Merge "Add carrier config for conference participants data support" am: 93931ccb81
am: c575a96d53

Change-Id: I827275c8f348d3440c7034ebc9e5b120645b8b48
2019-06-05 11:09:25 -07:00