Bill Yi
45ce869815
Import translations. DO NOT MERGE
...
Change-Id: I1ac0438bf521d379c17da50ec798ac9449d36bcb
Auto-generated-cl: translation import
2018-04-04 09:53:56 -07:00
Kevin Chyn
fff19c98b9
Merge "Fix fingerprint dialog icon color" into pi-dev am: 7c97601a43
...
am: c0e2681eb7
2018-04-03 20:40:09 -07:00
Andrii Kulian
84be5ace85
Merge "Prevent exception when stack being removed on crash" into pi-dev am: 6acf543681
...
am: 756a886015
2018-04-03 20:32:24 -07:00
Lucas Dupin
899a4c2af6
Merge "Separator width" into pi-dev am: a24ddf58c9
...
am: 52f11fb74e
2018-04-03 20:23:03 -07:00
Erik Kline
a9c669dbbd
[automerger skipped] Merge "Support bypassing TLS in the framework" into pi-dev am: 2bad006b0d -s ours
...
am: d46f0176c3
2018-04-03 20:12:07 -07:00
Evan Rosky
4ce7ea5e63
Merge "Use client-side version of inTouchMode" into pi-dev am: 3ec4b8ccfd
...
am: bdc641a6d5
2018-04-03 20:07:16 -07:00
Kevin Chyn
c0e2681eb7
Merge "Fix fingerprint dialog icon color" into pi-dev
...
am: 7c97601a43
2018-04-03 19:44:12 -07:00
Eugene Susla
47beaf407c
[automerger skipped] Merge "[DO NOT MERGE] Sort A11yService#getWindows by layer descending" into pi-dev am: 7694926d37
...
am: 35fb9a9192
2018-04-03 19:42:31 -07:00
Andrii Kulian
756a886015
Merge "Prevent exception when stack being removed on crash" into pi-dev
...
am: 6acf543681
2018-04-03 19:39:28 -07:00
Lucas Dupin
52f11fb74e
Merge "Separator width" into pi-dev
...
am: a24ddf58c9
2018-04-03 19:36:21 -07:00
Patrick Baumann
41977ea00d
Merge "Bind to DefaultContainerService early for AIA" into pi-dev am: 68e89707f4
...
am: 1673f6f972
2018-04-03 19:36:20 -07:00
Erik Kline
d46f0176c3
[automerger skipped] Merge "Support bypassing TLS in the framework" into pi-dev
...
am: 2bad006b0d
2018-04-03 19:33:34 -07:00
Phil Weaver
b4346c6e66
Merge "Move cts tests using reflection" into pi-dev am: fd533c751b
...
am: a483b18f99
2018-04-03 19:31:57 -07:00
Julia Reynolds
0f6cf1050c
Merge "Show ripple on toggle" into pi-dev am: 1d75ae7476
...
am: 976affea43
2018-04-03 19:27:39 -07:00
Mike Ma
d89ca90f2c
Merge "Register broadcast receiver at runtime instead" into pi-dev am: 806be6b602
...
am: 2873d59e0b
2018-04-03 19:23:05 -07:00
Evan Rosky
bdc641a6d5
Merge "Use client-side version of inTouchMode" into pi-dev
...
am: 3ec4b8ccfd
2018-04-03 19:17:33 -07:00
Julia Reynolds
c6bfcb1281
Merge "Ensure that the blocking helper will run" into pi-dev am: f3fa01e805
...
am: 0266ab5153
2018-04-03 19:12:10 -07:00
Eugene Susla
35fb9a9192
Merge "[DO NOT MERGE] Sort A11yService#getWindows by layer descending" into pi-dev
...
am: 7694926d37
2018-04-03 19:05:50 -07:00
Patrick Baumann
1673f6f972
Merge "Bind to DefaultContainerService early for AIA" into pi-dev
...
am: 68e89707f4
2018-04-03 19:00:14 -07:00
Phil Weaver
a483b18f99
Merge "Move cts tests using reflection" into pi-dev
...
am: fd533c751b
2018-04-03 18:57:01 -07:00
Julia Reynolds
976affea43
Merge "Show ripple on toggle" into pi-dev
...
am: 1d75ae7476
2018-04-03 18:54:09 -07:00
Mike Ma
2873d59e0b
Merge "Register broadcast receiver at runtime instead" into pi-dev
...
am: 806be6b602
2018-04-03 18:51:08 -07:00
Julia Reynolds
0266ab5153
Merge "Ensure that the blocking helper will run" into pi-dev
...
am: f3fa01e805
2018-04-03 18:41:38 -07:00
Kevin Chyn
7c97601a43
Merge "Fix fingerprint dialog icon color" into pi-dev
2018-04-04 01:21:13 +00:00
Matthew Ng
75da95fa96
Merge "Added two touch slops for easier home press (1/3)" into pi-dev am: e81e6faf08
...
am: 2ce1ddd2ed
2018-04-03 17:58:33 -07:00
Winson Chung
98af86261e
Merge changes from topic "fw_quickstep_update" into pi-dev am: 5fa07c0986
...
am: 19dc30ff54
2018-04-03 17:55:14 -07:00
Winson Chung
7e756be722
Allow recents animation to override divider minimized state am: f557c3b565
...
am: ea0adfdb10
2018-04-03 17:51:51 -07:00
Winson Chung
8e50da2016
Prevent unnecessary reordering of the home stack am: 6a38fca2d8
...
am: 40fb4a289a
2018-04-03 17:49:09 -07:00
Makoto Onuki
017f0af96e
Merge "Fix "auto battery saver" confirmation dialog button layout" into pi-dev am: 1c3e76b10e
...
am: bd086f6c8e
2018-04-03 17:45:55 -07:00
Julia Reynolds
703b235bd0
Merge "Add method to get blocked channel counts" into pi-dev am: 7065aedba0
...
am: 8252bb0c0f
2018-04-03 17:37:10 -07:00
Andrii Kulian
6acf543681
Merge "Prevent exception when stack being removed on crash" into pi-dev
2018-04-04 00:32:10 +00:00
Tony Mak
b9c9d2575c
Merge "Remove work_profile_deleted_description in symbols.xml" into pi-dev am: f01e2024d2
...
am: f12f8af9e6
2018-04-03 17:21:43 -07:00
Salvador Martinez
3afcdf1e93
Merge "Update notification to allow multiline text" into pi-dev am: a2117ce057
...
am: 3dd49d5365
2018-04-03 17:17:26 -07:00
TreeHugger Robot
a24ddf58c9
Merge "Separator width" into pi-dev
2018-04-04 00:14:54 +00:00
Julia Reynolds
0ca727ec68
Merge "Only tag foreground notifications" into pi-dev am: 59831cbec7
...
am: e6fb44f933
2018-04-03 17:13:07 -07:00
Lucas Dupin
b38dd69226
Merge "Longer wake lock timeout" into pi-dev am: 315c230cbb
...
am: cf46c7d609
2018-04-03 17:08:50 -07:00
Kenny Guy
71ddc4f7f0
Merge "Avoid null pointer when in getAmbientBrightnessStats" into pi-dev am: a43cedbf25
...
am: ee67c91323
2018-04-03 17:04:12 -07:00
Matthew Ng
2ce1ddd2ed
Merge "Added two touch slops for easier home press (1/3)" into pi-dev
...
am: e81e6faf08
2018-04-03 17:02:07 -07:00
Brad Stenning
9d387c69f2
Merge "Update displayId when a window is moved to a new display" into pi-dev am: 32e7a0c23b
...
am: c4b36e5c8a
2018-04-03 16:59:51 -07:00
Winson Chung
19dc30ff54
Merge changes from topic "fw_quickstep_update" into pi-dev
...
am: 5fa07c0986
2018-04-03 16:58:05 -07:00
Jean-Michel Trivi
f28e2f2d7d
Merge "AudioService: prevent muting of alarm / accessibility" into pi-dev am: 04dc4a02f0
...
am: 7d5849119b
2018-04-03 16:55:30 -07:00
Winson Chung
ea0adfdb10
Allow recents animation to override divider minimized state
...
am: f557c3b565
2018-04-03 16:53:49 -07:00
Kevin Chyn
178ace506b
Fix fingerprint dialog icon color
...
The Keyguard resource has 50% opacity on the "ridges" assets but 100% on
the "error" assets, making it very difficult to fix/animate correctly in
both Keyguard and FingerprintDialogView. This change decouples the
FingerprintDialogView from the Keyguard resource.
Fixes: 75290621
Test: manual test with FingerprintDialog APK
visually inspect colors/animations
Change-Id: Ie04c706e24e129f01b6ddb500c689f108c41ae3e
2018-04-03 16:53:19 -07:00
Todd Kennedy
6cd33dcded
Merge "Correct provider filtering" into pi-dev am: b8d46c2c14
...
am: 23d51d0943
2018-04-03 16:51:18 -07:00
Winson Chung
40fb4a289a
Prevent unnecessary reordering of the home stack
...
am: 6a38fca2d8
2018-04-03 16:49:41 -07:00
TreeHugger Robot
2bad006b0d
Merge "Support bypassing TLS in the framework" into pi-dev
2018-04-03 23:47:23 +00:00
Maggie Wang
8a5425e103
Merge "Fix test location provider bug" into pi-dev am: 4f79a18cc5
...
am: 542c52372c
2018-04-03 16:47:04 -07:00
Makoto Onuki
bd086f6c8e
Merge "Fix "auto battery saver" confirmation dialog button layout" into pi-dev
...
am: 1c3e76b10e
2018-04-03 16:43:42 -07:00
Steve Pfetsch
a5c2dc36b8
Merge "Relax angle-related false touch classification." into pi-dev am: 7f3e5bb053
...
am: e6e60c99d4
2018-04-03 16:42:20 -07:00
Julia Reynolds
8252bb0c0f
Merge "Add method to get blocked channel counts" into pi-dev
...
am: 7065aedba0
2018-04-03 16:39:52 -07:00
