Winson Chung
7393cfe326
Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev am: 66f2d56556
...
am: 58c6e603b2
2017-09-21 17:00:58 +00:00
Winson Chung
58c6e603b2
Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev
...
am: 66f2d56556
2017-09-21 16:46:20 +00:00
Winson Chung
66f2d56556
Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev
2017-09-21 16:38:16 +00:00
Selim Cinek
5a873bc122
Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev am: 204346c277
...
am: 98507bebf0
2017-09-21 04:45:56 +00:00
Selim Cinek
98507bebf0
Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev
...
am: 204346c277
2017-09-21 01:38:09 +00:00
TreeHugger Robot
204346c277
Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev
2017-09-21 01:29:53 +00:00
Selim Cinek
a6ee4bd1bc
Revert "Increased the text size for colorized notifications"
...
This reverts commit 299b3302ef
2017-09-20 23:03:12 +00:00
David Stevens
85cac19a66
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
...
am: 9282193c84
2017-09-20 00:18:26 +00:00
TreeHugger Robot
9f2f7a50ae
Merge "Delete unused interface IAM.swapDockedAndFullscreenStack()"
2017-09-20 00:18:07 +00:00
TreeHugger Robot
d4f7c5bc19
Merge "ActivityOptions.set/getLaunchStackId() be gone!"
2017-09-20 00:09:09 +00:00
David Stevens
9282193c84
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
2017-09-20 00:09:04 +00:00
Winson Chung
85d3c8a8f8
Ensure profile-specific PiP notification is shown.
...
- Pipe through user id when an activity is pinned, to ensure we show the
right notification with the correct profile badge that launches into the
correct profile's PiP settings.
Bug: 65417722
Test: Enter PiP for work profile app, ensure that it shows the notification
for that profile, and launches the profile-specific PiP settings.
Change-Id: I62b8e1b23cb81bfc60c93f452cf950ab06cbf32d
2017-09-19 14:06:01 -07:00
Wale Ogunwale
d5efc1fd0d
Delete unused interface IAM.swapDockedAndFullscreenStack()
...
Deleting so I don't have to convert to the new windowing model later.
Test: Existing test pass.
Change-Id: I6adbe11348e3f01f4e32d8b404b6399d5eff7152
2017-09-19 13:07:39 -07:00
David Stevens
67c036b1ba
Handle showWhenLocked on secondary displays
...
The keyguard has windows on the default display and the remote display
selected by MediaRouter. Keyguard occlusion only applies to the default
display. To make the activity showWhenLocked flag work on secondary
displays, pass the display id of the locked secondary display from the
SystemUi to KeyguardController and make its isKeyguardShowing method
take a displayId.
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testSecondaryDisplayShowWhenLocked
Bug: 64994006
Merged-In: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
Change-Id: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
2017-09-19 18:15:43 +00:00
David Stevens
78a6c4c926
Merge "Handle showWhenLocked on secondary displays"
2017-09-19 18:13:46 +00:00
Wale Ogunwale
0568aed2af
ActivityOptions.set/getLaunchStackId() be gone!
...
Removed ActivityOptions.set/getLaunchStackId() and replacement
ActivityOptions.set/getWindowingMode() and set/getActivityType()
Test: Existing tests pass.
Test: go/wm-smoke
Bug: 64146578
Change-Id: Ifc1c35f7b13c335cdf1a1694208e9fe0aea0c1fa
2017-09-19 10:36:52 -07:00
Santos Cordon
ac49b2c040
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev am: f7771c9f77
...
am: a17abfef56
2017-09-19 00:55:43 +00:00
Santos Cordon
a17abfef56
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev
...
am: f7771c9f77
2017-09-19 00:47:52 +00:00
Santos Cordon
01a4ea59f3
Fix missing RequiredPermission annotation.
...
Bug: 64360244
Test: Manual compilation.
Change-Id: I7091e366baf5bcaf29945e9a0e2a283309e54452
2017-09-18 18:39:55 +00:00
TreeHugger Robot
b2a0009cce
Merge "Added WindowConfigurationProto and friends"
2017-09-18 16:06:22 +00:00
Charles He
2fe81c0605
Merge "Status bar: correctly register disable flags"
2017-09-18 14:49:02 +00:00
Wale Ogunwale
0d5609ba8c
Added WindowConfigurationProto and friends
...
Also added WindowContainerProto and ConfigurationContainerProto
Will be used by cts tests in upcoming CLs that replace StackId APIs.
Test: adb shell dumpsys window --proto
Bug: 64146578
Change-Id: Id6ca2a93e3d15ac696ab54cb241870e973985967
2017-09-18 07:23:23 -07:00
Charles He
ede390982c
Status bar: correctly register disable flags
...
StatusBarManager has two sets of disable flags to control the visibility
of various UI components. These flags are registered in DisableRecord.
This CL fixes a bug where clearing one set of disable flags causes both
sets of flags to be cleared.
Bug: 65813446
Test: runtest systemui
Change-Id: I95948fd2464402b6f2fd123dba34b64aeeb80c90
2017-09-18 14:31:17 +01:00
Selim Cinek
56867b7072
Merge "Increased the text size for colorized notifications" into oc-mr1-dev am: dd3b6c83c6
...
am: f83e81117a
2017-09-15 21:34:25 +00:00
Selim Cinek
f83e81117a
Merge "Increased the text size for colorized notifications" into oc-mr1-dev
...
am: dd3b6c83c6
2017-09-15 21:26:46 +00:00
Selim Cinek
dd3b6c83c6
Merge "Increased the text size for colorized notifications" into oc-mr1-dev
2017-09-15 21:20:44 +00:00
Selim Cinek
299b3302ef
Increased the text size for colorized notifications
...
Increased the text sizes a bit to make them more prominent.
Test: add colorized notifications of all styles
Change-Id: Ie22053edcb0297e7c3ee0c43b29cdd0e7b6a4516
Fixes: 35925915
2017-09-15 11:08:30 -07:00
Jiyong Park
215df9c284
Merge "Merge "Fix missing null checking" into oc-mr1-dev am: 93d436f4bc" into oc-mr1-dev-plus-aosp
...
am: 2089f92625
2017-09-15 13:56:46 +00:00
Kevin Hufnagle
8f601e7da0
Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df am: 91fb9b2a16 am: 677b6f5a7b
...
am: 86ca0d2ad4
2017-09-15 11:33:20 +00:00
Lucas Dupin
ea35a29229
Merge "Show big text on AoD" into oc-mr1-dev am: a4996f241f
...
am: c86252c1dc
2017-09-15 11:21:33 +00:00
Jiyong Park
8aefdab7c3
Merge "Fix missing null checking" into oc-mr1-dev
...
am: 93d436f4bc
2017-09-15 02:47:46 +00:00
Kevin Hufnagle
86ca0d2ad4
Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df am: 91fb9b2a16
...
am: 677b6f5a7b
2017-09-15 02:24:50 +00:00
Jiyong Park
93d436f4bc
Merge "Fix missing null checking" into oc-mr1-dev
2017-09-15 02:19:19 +00:00
Kevin Hufnagle
677b6f5a7b
Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df
...
am: 91fb9b2a16
2017-09-15 01:01:15 +00:00
Kevin Hufnagle
91fb9b2a16
Merge "docs: updated link on RemoteInput page" into oc-dev
...
am: 6087b990df
2017-09-15 00:42:20 +00:00
Jiyong Park
b16d32bc78
Merge "vendor apk is unbundled" into oc-mr1-dev am: a26750e757
...
am: 6cc659cd9e
2017-09-15 00:13:49 +00:00
Jiyong Park
63495c2796
Fix missing null checking
...
Bug: 65666724
Test: build
Change-Id: Ie3fa891da012cbb3f313a33e0e5759f743887480
2017-09-15 08:07:41 +09:00
Lucas Dupin
c86252c1dc
Merge "Show big text on AoD" into oc-mr1-dev
...
am: a4996f241f
2017-09-14 22:32:57 +00:00
TreeHugger Robot
a4996f241f
Merge "Show big text on AoD" into oc-mr1-dev
2017-09-14 22:19:41 +00:00
George Mount
c04ea52629
Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev am: 465a956066
...
am: 42cb4b1d03
2017-09-14 22:00:36 +00:00
Lucas Dupin
06c5e642aa
Show big text on AoD
...
Test: Receive notification, look at AoD
Change-Id: I4ccb33895b5acf12a6341c22c853b0cf75036497
Fixes: 64128466
2017-09-14 10:10:08 -07:00
Jiyong Park
6cc659cd9e
Merge "vendor apk is unbundled" into oc-mr1-dev
...
am: a26750e757
2017-09-14 14:51:57 +00:00
George Mount
42cb4b1d03
Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev
...
am: 465a956066
2017-09-14 02:19:59 +00:00
TreeHugger Robot
a26750e757
Merge "vendor apk is unbundled" into oc-mr1-dev
2017-09-14 01:35:42 +00:00
George Mount
3ceb116d4c
Fix problem with empty AnimatorSet during fragment removal.
...
Bug: 65354043
When an empty AnimatorSet is used in a fragment animation,
it can end immediately. This CL properly detects this
case and handles it properly.
Test: manual, ran fragment CTS
Change-Id: I63bee3818106f9c8e86cdc94af61d6bc8407c789
2017-09-13 13:17:18 -07:00
David Stevens
53a39eacc2
Handle showWhenLocked on secondary displays
...
The keyguard has windows on the default display and the remote display
selected by MediaRouter. Keyguard occlusion only applies to the default
display. To make the activity showWhenLocked flag work on secondary
displays, pass the display id of the locked secondary display from the
SystemUi to KeyguardController and make its isKeyguardShowing method
take a displayId.
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testSecondaryDisplayShowWhenLocked
Bug: 64994006
Change-Id: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
2017-09-12 12:19:50 -07:00
Amith Yamasani
7bd888bea6
Merge "Remove incorrect note about truncation in the javadoc"
2017-09-12 15:54:47 +00:00
Amith Yamasani
8a0a614f45
Remove incorrect note about truncation in the javadoc
...
UsageStats is not truncating the events returned by queryEvents.
So removed the javadoc note that is no longer true.
Bug: 65556357
Test: N/A
Change-Id: I8206176951c3a3079b8317043f4cb696ffca67c0
2017-09-11 16:01:04 -07:00
George Mount
e89a95b3e5
Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev am: 2f35f15ab0
...
am: 87f68c849f
2017-09-11 18:42:06 +00:00
George Mount
87f68c849f
Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev
...
am: 2f35f15ab0
2017-09-11 17:40:46 +00:00
