OSDN Git Service
Lucas Dupin [Mon, 18 Jun 2018 18:31:49 +0000 (11:31 -0700)]
Merge "Fade to black without showing system wallpaper" into pi-dev am:
0e52664b0c
am:
d7330c4888
Change-Id: I5d46625235cbf58090b42594af3b49b290f7e878
TreeHugger Robot [Mon, 18 Jun 2018 18:28:19 +0000 (18:28 +0000)]
Merge "Fix StringIndexOutOfBoundsException in AccessibilityUtils"
Aaron Heuckroth [Mon, 18 Jun 2018 18:22:14 +0000 (18:22 +0000)]
Merge "Add delay to notifications before they can be dismissed."
Android Build Merger (Role) [Mon, 18 Jun 2018 18:18:40 +0000 (18:18 +0000)]
[automerger] Merge "Fade to black without showing system wallpaper" into pi-dev am:
0e52664b0c am:
2e575f413c
Change-Id: I28b6f791597056c07b504d070ab704d74a37d1df
Lucas Dupin [Mon, 18 Jun 2018 18:17:44 +0000 (11:17 -0700)]
Merge "Fade to black without showing system wallpaper" into pi-dev
am:
0e52664b0c
Change-Id: I7aeb34e75245f5bc9974110d9847efd03445acbd
Lucas Dupin [Mon, 18 Jun 2018 18:17:34 +0000 (11:17 -0700)]
Merge "Fade to black without showing system wallpaper" into pi-dev
am:
0e52664b0c
Change-Id: I68c83452ffcff8424aa58a0527a14f90497990d1
Aaron Heuckroth [Thu, 14 Jun 2018 18:28:08 +0000 (14:28 -0400)]
Add delay to notifications before they can be dismissed.
Test: Run jank tests. Create notifications with a delay, then attempt
to swipe them away as soon as they are perceivable to the user.
Swiping during the animation should not result in notification dismissal,
but swiping after the animation completes should.
Fixes:
70293267
Change-Id: Ibca02666255693255185b8bd326cc97d8c574b2e
Lucas Dupin [Mon, 18 Jun 2018 18:08:41 +0000 (18:08 +0000)]
Merge "Fade to black without showing system wallpaper" into pi-dev
Selim Cinek [Mon, 18 Jun 2018 17:52:53 +0000 (10:52 -0700)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev am:
ed9df0d176
am:
ae158f3925
Change-Id: Ieb7a009989c3f505c1f799e7eabc243929957a8b
Android Build Merger (Role) [Mon, 18 Jun 2018 17:46:19 +0000 (17:46 +0000)]
[automerger] Merge "Fixed an issue where the contentHeight was wrong" into pi-dev am:
ed9df0d176 am:
5c2a056a83
Change-Id: I501b10108f3f075b171ed0d97bc0ae1385e49a55
Selim Cinek [Mon, 18 Jun 2018 17:45:01 +0000 (10:45 -0700)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
am:
ed9df0d176
Change-Id: Ib607094d49ba35e14dd33d6993e343cda7594b5f
Selim Cinek [Mon, 18 Jun 2018 17:45:00 +0000 (10:45 -0700)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
am:
ed9df0d176
Change-Id: I7f9778580993a4762895839136209d307fdc765a
TreeHugger Robot [Mon, 18 Jun 2018 17:41:22 +0000 (17:41 +0000)]
Merge "Improved logging on autofill authentication."
Selim Cinek [Mon, 18 Jun 2018 17:32:20 +0000 (17:32 +0000)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
TreeHugger Robot [Mon, 18 Jun 2018 17:31:32 +0000 (17:31 +0000)]
Merge "Fixes for enqueued adjustments"
Lucas Dupin [Mon, 18 Jun 2018 17:21:42 +0000 (10:21 -0700)]
Merge "Pulse animation synchronization" into pi-dev am:
32066387e1
am:
f7dc3e269c
Change-Id: I9df3bdc93d2a6999334984bbdf487c73dc9f869c
Android Build Merger (Role) [Mon, 18 Jun 2018 17:09:56 +0000 (17:09 +0000)]
[automerger] Merge "Pulse animation synchronization" into pi-dev am:
32066387e1 am:
a5ca4128ef
Change-Id: I9b24483005a0cb0a714fc5816200d60e165c4144
Lucas Dupin [Mon, 18 Jun 2018 17:09:35 +0000 (10:09 -0700)]
Merge "Pulse animation synchronization" into pi-dev
am:
32066387e1
Change-Id: I8c3737cff95213b63fbee10195c6a246829b2843
Fan Zhang [Mon, 18 Jun 2018 16:42:38 +0000 (09:42 -0700)]
Fix StringIndexOutOfBoundsException in AccessibilityUtils
The string splitter is a sigleton but the access is not thread-safe. So
now it's changed to be a local instance to avoid threading problems.
Also removed a few unused test classes as clean up.
Change-Id: Ia2b3f3058fcbb0b28afff4e3d1b29184072bf45e
Fixes:
110255579
Test: robotests
Lucas Dupin [Mon, 18 Jun 2018 17:09:03 +0000 (10:09 -0700)]
Merge "Pulse animation synchronization" into pi-dev
am:
32066387e1
Change-Id: Ia2c8219d869fb61d22b5b81bf641fd488a5415a9
TreeHugger Robot [Mon, 18 Jun 2018 16:57:24 +0000 (16:57 +0000)]
Merge "Pulse animation synchronization" into pi-dev
TreeHugger Robot [Mon, 18 Jun 2018 16:49:51 +0000 (16:49 +0000)]
Merge "Remove dependency on IME subtype from TSMS"
Lucas Dupin [Mon, 11 Jun 2018 23:18:15 +0000 (16:18 -0700)]
Fade to black without showing system wallpaper
When on the lock screen, and going to AOD animated, user would
temporarily see the system wallpaper. That's not what we want,
we want to fade from semi-transparent black to black, on top
of the backdrop - lock screen wallpaper or media art.
Test: press power on the lock screen when playing media
Test: press power on the lock screen after dismissing media
Test: unlock from AOD
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Fixes:
80575770
Change-Id: I6796e844add889ff86be0cd2052db7c5d5073039
Jorim Jaggi [Mon, 18 Jun 2018 16:18:52 +0000 (09:18 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev am:
e8a1e7a423
am:
04749aa5c6 -s ours
Change-Id: I3145ec152a52aa552114b6fcf4f1e02ec24bd42f
Android Build Merger (Role) [Mon, 18 Jun 2018 16:10:26 +0000 (16:10 +0000)]
[automerger skipped] Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev am:
e8a1e7a423 skipped:
ea7b5d8020
Change-Id: I73708c52edf65365e4bf961b51211710d05bfcdb
Jorim Jaggi [Mon, 18 Jun 2018 16:09:43 +0000 (09:09 -0700)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
am:
e8a1e7a423
Change-Id: I160e9cab3b4ebd4d5a39443b8ea3990a7943d102
Jorim Jaggi [Mon, 18 Jun 2018 16:09:33 +0000 (09:09 -0700)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
am:
e8a1e7a423
Change-Id: I2b70059cc6735bfdf3fd60f4837b413f8966c637
Jorim Jaggi [Mon, 18 Jun 2018 15:52:09 +0000 (15:52 +0000)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
Jorim Jaggi [Mon, 18 Jun 2018 15:46:32 +0000 (08:46 -0700)]
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev am:
58150a7e6e
am:
8897621da4
Change-Id: I5df4d999aeb2acb702af78ab3de308380dd5904a
Android Build Merger (Role) [Mon, 18 Jun 2018 15:39:44 +0000 (15:39 +0000)]
[automerger] Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev am:
58150a7e6e am:
f3ebcb5905
Change-Id: Iabeab79445e736401ba39cc09331bdbf501c66af
Jorim Jaggi [Mon, 18 Jun 2018 15:38:58 +0000 (08:38 -0700)]
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev
am:
58150a7e6e
Change-Id: Ifeac639bd3d5b3dcd969beb0a6f9168c7971e5cf
Jorim Jaggi [Mon, 18 Jun 2018 15:38:51 +0000 (08:38 -0700)]
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev
am:
58150a7e6e
Change-Id: I02e61ad1e4759433fa39cb8d16e8926382d415f8
Julia Reynolds [Mon, 18 Jun 2018 14:19:20 +0000 (10:19 -0400)]
Fixes for enqueued adjustments
- Accept adjustments that arrie too late - send through the
normal 'apply adjustment to posted notification' flow
- Apply adjustments that are received onEnqueue
Test: runtest systemui-notification
Bug:
110347047
Change-Id: Ic4c9839cf2f63ef1689d72eb291f6bfae8f0674b
Jorim Jaggi [Mon, 18 Jun 2018 15:25:03 +0000 (15:25 +0000)]
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev
Wale Ogunwale [Tue, 8 May 2018 20:43:21 +0000 (13:43 -0700)]
Switched ActivityStack.mService to ActivityTaskManagerService (7/n)
Objects that contain or represent activities like ActivityStack can
no longer rely on ActivityManagerService as it is going to be in a
different package.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: I7ea20169245bee91f1be254ac30e88d2382c62a3
TreeHugger Robot [Mon, 18 Jun 2018 14:49:11 +0000 (14:49 +0000)]
Merge "Switched TaskRecord.mService to ActivityTaskManagerService (6/n)"
Julia Reynolds [Mon, 18 Jun 2018 14:11:26 +0000 (14:11 +0000)]
Merge "Fix notification interruption stats"
Jorim Jaggi [Fri, 8 Jun 2018 13:25:35 +0000 (15:25 +0200)]
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
Wale Ogunwale [Tue, 8 May 2018 17:35:38 +0000 (10:35 -0700)]
Switched TaskRecord.mService to ActivityTaskManagerService (6/n)
Objects that contain or represent activities like TaskRecord can
no longer rely on ActivityManagerService as it is going to be in a
different package.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: Ia17591f7d709839c18762d1eb2474b2e2f649dfc
Android Build Merger (Role) [Mon, 18 Jun 2018 13:12:56 +0000 (13:12 +0000)]
[automerger] Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev am:
ef4a56f9e4 am:
bba3c54256
Change-Id: Ia5fc6a5bef9664456dccf594798f2ccc53975720
Ahmed ElArabawy [Mon, 18 Jun 2018 13:12:22 +0000 (06:12 -0700)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
am:
ef4a56f9e4
Change-Id: I623d20464db6ebd8efe589987606f23c870d6283
Android Build Merger (Role) [Mon, 18 Jun 2018 13:05:41 +0000 (13:05 +0000)]
[automerger] Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7 am:
42fb737d13 am:
abac6b84c1
Change-Id: I4af26a8ef76833a741ef62f21bcb42adbed6d5b2
Android Build Merger (Role) [Mon, 18 Jun 2018 13:05:21 +0000 (13:05 +0000)]
[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 -s ours skipped:
13d94b91d2
Change-Id: I614fa2aebd202c9478ff782f4762cd22eb8a87af
Bill Yi [Mon, 18 Jun 2018 13:04:41 +0000 (06:04 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7
am:
42fb737d13
Change-Id: I38f6349a440fb068af4a6382c11b0914e30e6047
Android Build Merger (Role) [Mon, 18 Jun 2018 12:57:30 +0000 (12:57 +0000)]
Merge "Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev am:
ef4a56f9e4 am:
77d5344926"
Bill Yi [Mon, 18 Jun 2018 12:56:01 +0000 (05:56 -0700)]
[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 -s ours
Change-Id: I8fc6b85610ce5747d02053c587c4e8cd05be4a42
Android Build Merger (Role) [Mon, 18 Jun 2018 12:55:32 +0000 (12:55 +0000)]
[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 -s ours skipped:
86b491a574
Change-Id: Ib1f7efbe4b2dbacfdcf6c64d94416a11c7feed3f
Ahmed ElArabawy [Mon, 18 Jun 2018 12:55:20 +0000 (05:55 -0700)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev am:
ef4a56f9e4
am:
77d5344926
Change-Id: I89f4fc12b5a566a060cbdc88debad2c5108e0b72
Bill Yi [Mon, 18 Jun 2018 12:55:01 +0000 (05:55 -0700)]
[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 -s ours
Change-Id: Ide3590768b6e472991376ced275114191a3f552d
Android Build Merger (Role) [Mon, 18 Jun 2018 12:54:28 +0000 (12:54 +0000)]
[automerger] Merge "Skip null values in Utils.safeForeach" into pi-dev am:
c5901f5a06 am:
547d43e878
Change-Id: I319ccd1f3da743a286b7fc451743ce22906b4bef
Beverly [Mon, 18 Jun 2018 12:54:05 +0000 (05:54 -0700)]
Merge "Skip null values in Utils.safeForeach" into pi-dev
am:
c5901f5a06
Change-Id: I7a715578f6e715262ccb294d2e5ea2326ae1c075
Android Build Merger (Role) [Mon, 18 Jun 2018 12:49:52 +0000 (12:49 +0000)]
[automerger] Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am:
a74fbef8ce am:
114e58a6f9
Change-Id: I72e82a69c75b1ad155dcb8c657175248b68442ab
Kevin Chyn [Mon, 18 Jun 2018 12:49:12 +0000 (05:49 -0700)]
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
am:
a74fbef8ce
Change-Id: I28f349b3674126a85731489fd8119b41385934a7
Jorim Jaggi [Mon, 18 Jun 2018 12:24:11 +0000 (14:24 +0200)]
DO NOT MERGE Fix crash in case of no overlays
Fixes:
110330180
Test: Rotate a device without overlays/cutout
Change-Id: Ib0701e26893489fcee0de6aaec26901aef0b8348
Android Build Merger (Role) [Mon, 18 Jun 2018 12:44:53 +0000 (12:44 +0000)]
[automerger] Merge "Hiding replied notification icons from AOD" into pi-dev am:
37e96a8fa5 am:
fb0a932ccc
Change-Id: I6633bfc08619d736664eae529fcec03763edbd1d
Selim Cinek [Mon, 18 Jun 2018 12:44:33 +0000 (05:44 -0700)]
Merge "Hiding replied notification icons from AOD" into pi-dev
am:
37e96a8fa5
Change-Id: Iee5f8b80ead2427af699f72aad297617b2fc3329
Ahmed ElArabawy [Mon, 18 Jun 2018 12:40:36 +0000 (05:40 -0700)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
am:
ef4a56f9e4
Change-Id: I360dc4b35d2b6acf956fd442299df330d54cbb5d
Android Build Merger (Role) [Mon, 18 Jun 2018 12:40:14 +0000 (12:40 +0000)]
[automerger] Merge changes I90451c14,I9fb27a0a into pi-dev am:
b91dd1d944 am:
f000c614dc
Change-Id: If0984fc32694d47900095e278922834ddc36aa63
Adrian Roos [Mon, 18 Jun 2018 12:39:20 +0000 (05:39 -0700)]
Merge changes I90451c14,I9fb27a0a into pi-dev
am:
b91dd1d944
Change-Id: I0e33553729a96e597b8e6f8e741b6cae37504175
Ahmed ElArabawy [Mon, 18 Jun 2018 12:26:40 +0000 (12:26 +0000)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
Chalard Jean [Mon, 18 Jun 2018 11:17:19 +0000 (04:17 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632 am:
84d4e535ae am:
ea044ca373
am:
52688e800f
Change-Id: If2794c9ff81ecad4b30a5c7c2578c1ee7e8c85b9
Chalard Jean [Mon, 18 Jun 2018 11:07:09 +0000 (04:07 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632 am:
84d4e535ae
am:
ea044ca373
Change-Id: Iea011d1dc5df03b58fcbb9dcbd4833b20cb5b5a8
Chalard Jean [Mon, 18 Jun 2018 10:06:05 +0000 (03:06 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
am:
84d4e535ae
Change-Id: I7278ffe7ca8e25b040d6bce7fb880ccf0984f6ee
Chalard Jean [Mon, 18 Jun 2018 09:00:40 +0000 (09:00 +0000)]
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
Kazuki Takise [Mon, 18 Jun 2018 08:55:09 +0000 (08:55 +0000)]
Merge "Add always on top feature support"
Andreas Gampe [Mon, 18 Jun 2018 08:37:04 +0000 (01:37 -0700)]
Merge "Apf: Avoid constant overflow" am:
5b99659943 am:
4afe1f957b
am:
a2f5d7481c
Change-Id: I5b33123f2044cc00c5516be8bcbe82591c78b670
Andreas Gampe [Mon, 18 Jun 2018 08:28:52 +0000 (01:28 -0700)]
Merge "Apf: Avoid constant overflow" am:
5b99659943
am:
4afe1f957b
Change-Id: Id2e62fe7d34d88633ae9cd4c9a01c6a5a1eed838
Andreas Gampe [Mon, 18 Jun 2018 08:20:28 +0000 (01:20 -0700)]
Merge "Apf: Avoid constant overflow"
am:
5b99659943
Change-Id: Iacf849e3739f24cd430e6210a2e6a1c67ae0614f
Bill Yi [Mon, 18 Jun 2018 07:53:52 +0000 (00:53 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7 am:
42fb737d13
am:
4e1d045e01
Change-Id: I5a7715e5fd51cc8b7a81fefe517e1604b34e4520
Bill Yi [Mon, 18 Jun 2018 07:44:01 +0000 (00:44 -0700)]
[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 -s ours
am:
a146e04799 -s ours
Change-Id: Id09240de883f1199f59159af89e683ee09b5983a
Bill Yi [Mon, 18 Jun 2018 07:39:33 +0000 (00:39 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7
am:
42fb737d13
Change-Id: I11dcf3e181aaa1c425eb47bc66a1d754804ed1a2
Bill Yi [Mon, 18 Jun 2018 07:30:00 +0000 (00:30 -0700)]
[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 -s ours
Change-Id: I37882b0f82989f3d257a3f206fa9d3867713e57e
Bill Yi [Mon, 18 Jun 2018 07:23:36 +0000 (00:23 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06
am:
d4a1791bd7
Change-Id: I165a9d006345b6624877fc3b453ceb2b0baa83fb
Bill Yi [Mon, 18 Jun 2018 07:15:09 +0000 (00:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours am:
f57c14b641 -s ours
am:
bc1dc5c368 -s ours
Change-Id: Ied727ed9887bc299b944611f1caed5896d8e81ce
Bill Yi [Mon, 18 Jun 2018 07:09:08 +0000 (00:09 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa
am:
3cca4e7b06
Change-Id: Ifaa547b16411e79759647dd9cc53ea76526f5e5d
Bill Yi [Mon, 18 Jun 2018 07:02:54 +0000 (00:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours
am:
f57c14b641 -s ours
Change-Id: Id5433baa969e08bd0253cb921bdaa541a1eaad3a
Bill Yi [Mon, 18 Jun 2018 06:55:44 +0000 (23:55 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev
am:
3c047ea7fa
Change-Id: Ie97567da2988d921748f9b4ca86f658a5222f43b
Bill Yi [Mon, 18 Jun 2018 06:54:30 +0000 (23:54 -0700)]
[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 -s ours
am:
db9728b756 -s ours
Change-Id: I1e0ba0f8a4abff0ecd6a7b0523693e832870f1cd
Bill Yi [Mon, 18 Jun 2018 06:53:27 +0000 (23:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
am:
437da4c13d -s ours
Change-Id: I8227403ab7fa849fcc096d3a0acfa583843abf3b
Bill Yi [Mon, 18 Jun 2018 06:50:41 +0000 (23:50 -0700)]
[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 -s ours
Change-Id: I1f7790c7a09b36424a524fa3010dd2b6fe43fc1e
Bill Yi [Mon, 18 Jun 2018 06:33:25 +0000 (23:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours am:
d996012ef5 -s ours
am:
97ee183747 -s ours
Change-Id: I606378e5028548c5189a9fe554a868512112578c
TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4
Import translations. DO NOT MERGE
Bill Yi [Mon, 18 Jun 2018 06:26:21 +0000 (23:26 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours
am:
d996012ef5 -s ours
Change-Id: Idcb8df6ed5993f00170408e685080aa525f291e1
TreeHugger Robot [Mon, 18 Jun 2018 06:22:15 +0000 (06:22 +0000)]
Merge "Remove unused parameter from TSMS IPC"
Bill Yi [Mon, 18 Jun 2018 06:18:56 +0000 (23:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b
am:
cb1a10f5b6 -s ours
Change-Id: Ib5adcfbe4afabfee3e391ec528272f210b408a10
Treehugger Robot [Mon, 18 Jun 2018 06:16:23 +0000 (06:16 +0000)]
Merge "Apf: Avoid constant overflow"
Kazuki Takise [Thu, 31 May 2018 06:32:19 +0000 (15:32 +0900)]
Add always on top feature support
Add basic functionalities for always on top feature.
- Add a new flag to WindowConfiguration to represent a task wanting to
be on top.
- Update the logic on changing the z-order of windows to make sure
always on top windows are placed above other windows.
Bug:
69370884
Test: go/wm-smoke
Test: atest DisplayContentTests
Test: Used ArcCompanionLibDemo app to verify that when always-on-top is
set, the app is above the other Android apps and Chrome windows.
Change-Id: Ie8edeb8ceeed0b9ec154b6031ed6cbe7ecc65b12
Yohei Yukawa [Fri, 15 Jun 2018 23:36:39 +0000 (16:36 -0700)]
Remove dependency on IME subtype from TSMS
Now that we are going to reduce the dependency on InputMethodSubtype
everywhere, TextServicesManagerService#getCurrentSpellCheckerSubtype()
is a good candidate to clean up.
Given that imm.getCurrentInputMethodSubtype().getLocale() is not that
reliable, always using the fallback logic to use the system locale is
less likely to make things worse.
Also, directly calling IME API from TextServicesManagerService have
caused multiple issues like Bug
28889203 and Bug
31273203. Removing
this API call should have positive impact on code health and system
stability.
Fix:
110275412
Test: Manually verified that spell checker still works
Change-Id: Ic222b21ce5ec4fc17b338eb5519e6928d853c8b6
Yohei Yukawa [Mon, 18 Jun 2018 03:52:37 +0000 (20:52 -0700)]
Remove unused parameter from TSMS IPC
TextServicesManager always sets null to the "locale" parameter in
ITextServicesManager#getCurrentSpellCheckerSubtype then
TextServicesManagerService always ignores that parameter. It can be
safely removed.
Bug:
110275412
Test: Manually verified that spell checker still works
Change-Id: I5d85089899b0bd077f69971d77095859086a8d52
Wale Ogunwale [Tue, 8 May 2018 16:25:50 +0000 (09:25 -0700)]
Switched ActivityRecord.service to ActivityTaskManagerService (5/n)
Objects that contain or represent activities like ActivityRecord can
no longer rely on ActivityManagerService as it is going to be in a
different package.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: I7eabc9b80e494367d79ff7452c88ba82ff216bcd
Wale Ogunwale [Sun, 17 Jun 2018 20:41:31 +0000 (20:41 +0000)]
Merge "Moved mRecentTasks to ActivityManagerTaskService (4/n)"
Wale Ogunwale [Mon, 7 May 2018 22:00:49 +0000 (15:00 -0700)]
Moved mRecentTasks to ActivityManagerTaskService (4/n)
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: I7e48eaf66200f689757578461076e9288b862b33
Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:12 +0000 (12:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
Change-Id: Iae0ad51f828f91b8211e0671900f2ffa1265c655
Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:05 +0000 (12:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4
Change-Id: I3f93da28223af89a03736689e7f35a723b864ff5
Bill Yi [Sun, 17 Jun 2018 12:13:32 +0000 (05:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I681a0e79a709f3cabf8b661ec5229480d99dd840
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 17 Jun 2018 10:03:39 +0000 (10:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b
Change-Id: I387f439df9441d64a658344837e4a2bd0f88a128
Android Build Merger (Role) [Sun, 17 Jun 2018 10:03:31 +0000 (10:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d
Change-Id: I6a3ddad855bdc4ae74eab3e6e2cd42290176aab4
Bill Yi [Sun, 17 Jun 2018 10:02:56 +0000 (03:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied5693d3e59e24f43a7a1577471819c269c7d6df
Auto-generated-cl: translation import
Christopher Ferris [Sat, 16 Jun 2018 06:56:14 +0000 (23:56 -0700)]
[automerger skipped] Merge "Merge "Use the malloc debug heap dumper." am:
0ec0c17596 am:
84c9e9a787" into pi-dev-plus-aosp
am:
da5fb6eac7 -s ours
Change-Id: If0cfb06266b5d75dc50d900117a154b94823853b
Christopher Ferris [Sat, 16 Jun 2018 06:32:04 +0000 (23:32 -0700)]
[automerger skipped] Merge "Use the malloc debug heap dumper." am:
0ec0c17596 am:
84c9e9a787
am:
4d5ba2e496 -s ours
Change-Id: I4f1d4939e3b45b57dea8b8af2392501351e2b84b
OSDN Git Service
