Selim Cinek
ae158f3925
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
...
am: ed9df0d176
2018-06-18 10:45:00 -07:00
Selim Cinek
ed9df0d176
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
2018-06-18 17:32:20 +00:00
Lucas Dupin
f7dc3e269c
Merge "Pulse animation synchronization" into pi-dev
...
am: 32066387e1
2018-06-18 10:09:35 -07:00
TreeHugger Robot
32066387e1
Merge "Pulse animation synchronization" into pi-dev
2018-06-18 16:57:24 +00:00
Jorim Jaggi
04749aa5c6
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
...
am: e8a1e7a423
2018-06-18 09:09:43 -07:00
Jorim Jaggi
e8a1e7a423
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
2018-06-18 15:52:09 +00:00
Jorim Jaggi
8897621da4
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev
...
am: 58150a7e6e
2018-06-18 08:38:51 -07:00
Jorim Jaggi
58150a7e6e
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev
2018-06-18 15:25:03 +00:00
Jorim Jaggi
af0d6d26d1
Prevent showing windows while animating to avoid color mode switch
...
If we switch the color mode during a transition, it's pretty much
guaranteed that SF is going to jank. To work around that, we
disallow showing the real content while an activity with a
non-standard-color mode is animating.
Test: Reopen photos, observe no jank
Bug: 79878256
Change-Id: Id27db483844d9424ccfb9afdebd31325eae0cdd8
2018-06-18 15:56:34 +02:00
Jorim Jaggi
0fca17c2a6
DO NOT MERGE Fix crash in case of no overlays
...
Fixes: 110330180
Test: Rotate a device without overlays/cutout
Change-Id: Ib0701e26893489fcee0de6aaec26901aef0b8348
2018-06-18 12:45:49 +00:00
Ahmed ElArabawy
77d5344926
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
...
am: ef4a56f9e4
2018-06-18 05:40:36 -07:00
Ahmed ElArabawy
ef4a56f9e4
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
2018-06-18 12:26:40 +00:00
Chalard Jean
52688e800f
Merge changes I4b1bca8b,Idb7d2f28,I4825e632 am: 84d4e535ae
...
am: ea044ca373
2018-06-18 04:07:09 -07:00
Chalard Jean
ea044ca373
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
...
am: 84d4e535ae
2018-06-18 03:06:05 -07:00
Chalard Jean
84d4e535ae
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
...
* changes:
[PT09] Add javadoc comments to all ProxyTracker methods/members.
[PT08] Move setDefaultProxy to ProxyTracker
[PT07] Small cleanup of setGlobalProxy
2018-06-18 09:00:40 +00:00
Andreas Gampe
a2f5d7481c
Merge "Apf: Avoid constant overflow" am: 5b99659943
...
am: 4afe1f957b
2018-06-18 01:28:52 -07:00
Andreas Gampe
4afe1f957b
Merge "Apf: Avoid constant overflow"
...
am: 5b99659943
2018-06-18 01:20:28 -07:00
Bill Yi
4e1d045e01
Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev am: 3c047ea7fa am: 3cca4e7b06 am: d4a1791bd7
...
am: 42fb737d13
2018-06-18 00:39:33 -07:00
Bill Yi
a146e04799
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23 am: 437da4c13d -s ours am: f57c14b641 -s ours am: bc1dc5c368 -s ours
...
am: 8d70303da7
2018-06-18 00:30:00 -07:00
Bill Yi
42fb737d13
Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev am: 3c047ea7fa am: 3cca4e7b06
...
am: d4a1791bd7
2018-06-18 00:23:36 -07:00
Bill Yi
8d70303da7
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23 am: 437da4c13d -s ours am: f57c14b641 -s ours
...
am: bc1dc5c368
2018-06-18 00:15:09 -07:00
Bill Yi
d4a1791bd7
Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev am: 3c047ea7fa
...
am: 3cca4e7b06
2018-06-18 00:09:08 -07:00
Bill Yi
bc1dc5c368
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23 am: 437da4c13d -s ours
...
am: f57c14b641
2018-06-18 00:02:54 -07:00
Bill Yi
3cca4e7b06
Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev
...
am: 3c047ea7fa
2018-06-17 23:55:44 -07:00
Bill Yi
f57c14b641
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23
...
am: 437da4c13d
2018-06-17 23:53:27 -07:00
Bill Yi
db9728b756
[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b am: cb1a10f5b6 -s ours am: d996012ef5 -s ours am: 97ee183747 -s ours
...
am: 15123e0230
2018-06-17 23:50:41 -07:00
Bill Yi
15123e0230
[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b am: cb1a10f5b6 -s ours am: d996012ef5 -s ours
...
am: 97ee183747
2018-06-17 23:33:25 -07:00
TreeHugger Robot
3c047ea7fa
Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev
...
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4b06ba83b23422582d9c4
2018-06-18 06:27:04 +00:00
Bill Yi
97ee183747
[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b am: cb1a10f5b6 -s ours
...
am: d996012ef5
2018-06-17 23:26:21 -07:00
Bill Yi
d996012ef5
[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b
...
am: cb1a10f5b6
2018-06-17 23:18:56 -07:00
Treehugger Robot
5b99659943
Merge "Apf: Avoid constant overflow"
2018-06-18 06:16:23 +00:00
Android Build Merger (Role)
437da4c13d
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23
...
Change-Id: Iae0ad51f828f91b8211e0671900f2ffa1265c655
2018-06-17 12:14:12 +00:00
Android Build Merger (Role)
b06ba83b23
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4
...
Change-Id: I3f93da28223af89a03736689e7f35a723b864ff5
2018-06-17 12:14:05 +00:00
Bill Yi
422582d9c4
Import translations. DO NOT MERGE
...
Change-Id: I681a0e79a709f3cabf8b661ec5229480d99dd840
Auto-generated-cl: translation import
2018-06-17 05:13:32 -07:00
Android Build Merger (Role)
cb1a10f5b6
[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b
...
Change-Id: I387f439df9441d64a658344837e4a2bd0f88a128
2018-06-17 10:03:39 +00:00
Android Build Merger (Role)
693ad9800b
[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d
...
Change-Id: I6a3ddad855bdc4ae74eab3e6e2cd42290176aab4
2018-06-17 10:03:31 +00:00
Bill Yi
cbc81e618d
Import translations. DO NOT MERGE
...
Change-Id: Ied5693d3e59e24f43a7a1577471819c269c7d6df
Auto-generated-cl: translation import
2018-06-17 03:02:56 -07:00
Android Build Merger (Role)
da5fb6eac7
Merge "Merge "Use the malloc debug heap dumper." am: 0ec0c17596 am: 84c9e9a787" into pi-dev-plus-aosp
2018-06-16 05:58:39 +00:00
Christopher Ferris
4d5ba2e496
Merge "Use the malloc debug heap dumper." am: 0ec0c17596
...
am: 84c9e9a787
2018-06-15 22:58:09 -07:00
Beverly
e0d3e1c2d5
Merge "Skip null values in Utils.safeForeach" into pi-dev
...
am: c5901f5a06
2018-06-15 22:55:05 -07:00
Android Build Merger (Role)
fe611a5700
Merge "Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am: a74fbef8ce" into pi-dev-plus-aosp
2018-06-16 05:50:04 +00:00
Kevin Chyn
ecc07726e2
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
...
am: a74fbef8ce
2018-06-15 22:49:30 -07:00
Colin Cross
6c40e4745d
Merge "Fix ManifestMerger issues" am: 684b5f038b
...
am: c5e5b64b04
2018-06-15 22:46:10 -07:00
Christopher Ferris
84c9e9a787
Merge "Use the malloc debug heap dumper."
...
am: 0ec0c17596
2018-06-15 22:41:30 -07:00
TreeHugger Robot
c5901f5a06
Merge "Skip null values in Utils.safeForeach" into pi-dev
2018-06-16 03:16:06 +00:00
TreeHugger Robot
a74fbef8ce
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
2018-06-16 00:28:17 +00:00
Colin Cross
c5e5b64b04
Merge "Fix ManifestMerger issues"
...
am: 684b5f038b
2018-06-15 16:59:21 -07:00
Selim Cinek
0dac634ed0
Merge "Hiding replied notification icons from AOD" into pi-dev
...
am: 37e96a8fa5
2018-06-15 14:53:49 -07:00
Adrian Roos
22ffb55de6
Merge changes I90451c14,I9fb27a0a into pi-dev
...
am: b91dd1d944
2018-06-15 14:48:23 -07:00
Christopher Ferris
0ec0c17596
Merge "Use the malloc debug heap dumper."
2018-06-15 21:36:42 +00:00
