Benjamin Franz
9a9a9aa9b3
Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev
...
am: 3f7fdaa
2016-04-11 14:41:38 +00:00
Benjamin Franz
3f7fdaaa76
Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev
2016-04-11 14:32:49 +00:00
Benjamin Franz
a26c626564
Revert "Throw security exception for non-parent aware APIs"
...
This reverts commit bd7ae782ed
2016-04-11 12:43:17 +00:00
Clara Bayarri
3f192435a9
Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev
...
am: 738ab04
2016-04-11 09:47:39 +00:00
Clara Bayarri
738ab04fd9
Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev
2016-04-11 09:43:16 +00:00
Amith Yamasani
597965f538
Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev
...
am: 0cc0381
2016-04-09 01:43:20 +00:00
Amith Yamasani
0cc0381714
Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev
2016-04-09 00:47:23 +00:00
Julia Reynolds
af343d6796
Merge "Allow the ranker to autobundle notifications." into nyc-dev
...
am: 3898db9
2016-04-09 00:41:35 +00:00
Dianne Hackborn
97907066c6
Merge "Fix issue #28075893 : Don\'t hold strong refs on to JobService" into nyc-dev
...
am: 6827db3#28075893 : Don't hold strong refs on to JobService
Change-Id: I0112842918f713cbf30d061f82dcdfa4e8c084ca
2016-04-09 00:40:37 +00:00
Andrii Kulian
d4b770e16e
Merge "Fix multiple configuration changes in multiwindow" into nyc-dev
...
am: 21400cb
2016-04-09 00:39:52 +00:00
Julia Reynolds
3898db9e15
Merge "Allow the ranker to autobundle notifications." into nyc-dev
2016-04-08 20:13:45 +00:00
Dianne Hackborn
6827db3e5f
Merge "Fix issue #28075893 : Don't hold strong refs on to JobService" into nyc-dev
2016-04-08 19:28:42 +00:00
Andrii Kulian
21400cb552
Merge "Fix multiple configuration changes in multiwindow" into nyc-dev
2016-04-08 19:05:20 +00:00
Andrii Kulian
701214b282
Fix multiple configuration changes in multiwindow
...
When in split-screen mode and activity handles configuration changes
it gets 2 onConfigurationChanged calls which originate from
ActivityManagerService#updateConfigurationLocked:
1. app.thread.scheduleConfigurationChanged calls to all process records
send configuration of the whole screen for corresponding orientation,
which leads to CONFIGURATION_CHANGED message in ActivityThread.
2. mStackSupervisor.resizeStackLocked call resizes both visible stacks and
eventually ActivityThread receives ACTIVITY_CONFIGURATION_CHANGED
message with correct configuration corresponding to space occupied in
split-screen.
In this CL if component callback is an instance of Activity and it had
override config set - onConfigurationChanged will not be triggered unless
override config has changed.
Bug: 27948331
Change-Id: Ia73b045570b44eb5b351811bf6c4f63d78c3f909
2016-04-08 11:58:43 -07:00
Julia Reynolds
e46bb37acf
Allow the ranker to autobundle notifications.
...
Bug: 26709317
Change-Id: I5017a471604e513a7b582cdc2f3472441e108fae
2016-04-08 13:55:03 -04:00
Amith Yamasani
d8d967e425
Improved javadoc for onLocalVoiceInteractionStopped
...
Improved docs per API review: b/27365473
Change-Id: I8e2fd5291ecf3c41b4c1fa4df62b0dc69597c122
2016-04-08 09:57:01 -07:00
Benjamin Franz
1acb890351
Merge "Throw security exception for non-parent aware APIs" into nyc-dev
...
am: 5c1fbad
2016-04-08 12:08:47 +00:00
Benjamin Franz
5c1fbadb1a
Merge "Throw security exception for non-parent aware APIs" into nyc-dev
2016-04-08 12:02:26 +00:00
Dianne Hackborn
0796e9fb3d
Fix issue #28075893 : Don't hold strong refs on to JobService
...
Change-Id: I822adaee953be9b14213def001b174d5c348fa14
2016-04-07 17:29:36 -07:00
Jorim Jaggi
220a9090ac
Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev
...
am: 7c3912e
2016-04-07 23:52:43 +00:00
Jorim Jaggi
7c3912e4ab
Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev
2016-04-07 23:40:44 +00:00
Tim Murray
f2a63fda7d
Merge "Improve service start/creation tracing." into nyc-dev
...
am: d8ca02f
2016-04-07 23:30:18 +00:00
Tim Murray
d8ca02f252
Merge "Improve service start/creation tracing." into nyc-dev
2016-04-07 23:19:38 +00:00
Jorim Jaggi
d53f09254e
Dismiss docked stack when opening non-resizable activity
...
- Also move the toast to SysemUI as a cleanup.
Bug: 27341740
Bug: 28026841
Change-Id: Ic6196ed75511751c6fadb12fa24574c881100f65
2016-04-07 16:07:27 -07:00
Tim Murray
b6f5a4292b
Improve service start/creation tracing.
...
bug 27998068
Change-Id: If18ab5d293f0bb0dfbfbed2f2af383c349464963
2016-04-07 15:37:43 -07:00
Alex Hills
52546b014b
Merge "Adds support for MessagingStyle" into nyc-dev
...
am: 5418765
2016-04-07 20:08:33 +00:00
Alexander Hills
5418765d4d
Merge "Adds support for MessagingStyle" into nyc-dev
2016-04-07 19:59:20 +00:00
Alex Hills
fc737def02
Adds support for MessagingStyle
...
This change adds support for the new MessagingStyle, which
supports a fully back-and-forth messaging/chat experience
within the notification display itself.
Bug:28043958
Change-Id: Ibb9c2a0784f028d8cf01bd3cee4fecc5f72d68cd
2016-04-07 15:19:14 -04:00
Phil Weaver
8c1e665bc5
Merge "Allow tests to change UiAutomation flags." into nyc-dev
...
am: d408b99
2016-04-07 16:48:01 +00:00
Phil Weaver
d408b995c3
Merge "Allow tests to change UiAutomation flags." into nyc-dev
2016-04-07 16:35:27 +00:00
Ricky Wai
869ecf225a
Merge "Fix work profile screen timeout policy" into nyc-dev
...
am: bdc3961
2016-04-07 16:28:00 +00:00
Ricky Wai
035e924470
Fix work profile screen timeout policy
...
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.
Bug: 27493348
Change-Id: Ia1ec1cafc7665c54816833af64e0f446a77a55b2
2016-04-07 17:16:03 +01:00
Alex Hills
9f1e6de054
Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev
...
am: a5ec16e
2016-04-07 13:59:56 +00:00
Alexander Hills
a5ec16e367
Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev
2016-04-07 13:52:58 +00:00
Clara Bayarri
eb3c2d3e63
Expose the Keyboard Shortcuts Helper in Activity
...
This allows apps to trigger it from their own menus
Bug: 27811273
Change-Id: I028caa5a88bb0e1c51238db28bb496293b78f90b
2016-04-07 13:35:23 +01:00
Benjamin Franz
bd7ae782ed
Throw security exception for non-parent aware APIs
...
When the parent instance of DPM is used to call an API that is not
parent-aware, we should throw a security exception.
Bug: 27532279
Change-Id: I90abeb4c8522cb9af798301c1bb2048579596993
2016-04-07 10:15:02 +01:00
Alex Hills
9ab3a238b3
Adds a content-intent-launching-activity flag to WearableExtender
...
This adds a flag to WearableExtender (and Action.WearableExtender)
indicating that the attached ContentIntent will launch an activity
on Wear, which lets the platform know that it can (and should)
generate a sleek transition for the launching of said intent (as
opposed to the intent causing change in the background).
Bug:28019194
Change-Id: Id8b422ea52c5e941e38558aaf31ce2cf4bb7c6f3
2016-04-06 17:20:11 -04:00
Selim Cinek
1c81841e06
Merge "Changed the default if the notification time is shown" into nyc-dev
...
am: f2a587b
2016-04-06 20:51:46 +00:00
Selim Cinek
ac51be5b1c
Merge "Deprecated the contentinfo and the number" into nyc-dev
...
am: 82404bc
2016-04-06 20:51:42 +00:00
Selim Cinek
f2a587b424
Merge "Changed the default if the notification time is shown" into nyc-dev
2016-04-06 20:48:09 +00:00
Selim Cinek
82404bc068
Merge "Deprecated the contentinfo and the number" into nyc-dev
2016-04-06 20:45:56 +00:00
Selim Cinek
0ff1ce6075
Changed the default if the notification time is shown
...
By default the notification time is not shown anymore.
Bug: 27431551
Change-Id: I68f19450d0de795a51644e939a3fd64366c0abb6
2016-04-06 12:22:46 -07:00
Selim Cinek
0f9dd1e2f5
Deprecated the contentinfo and the number
...
It was mainly adding noise to the notification
rather than useful information.
Bug: 27431551
Change-Id: Ie22c9935d60eeac1cca5d9ce97239aadfac9b3cf
2016-04-06 12:18:31 -07:00
Tony Mak
90bdf5acb7
Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev
...
am: a01c1f0
2016-04-06 18:44:06 +00:00
Tony Mak
a01c1f0d90
Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev
2016-04-06 18:39:21 +00:00
Adam Powell
237ce73ed9
Merge "Fragment#setUserVisibleHint guard" into nyc-dev
...
am: c0eb067
2016-04-06 17:34:34 +00:00
Adam Powell
c0eb067ceb
Merge "Fragment#setUserVisibleHint guard" into nyc-dev
2016-04-06 17:26:53 +00:00
Robin Lee
0694d0095c
Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev
...
am: 589b855
2016-04-06 17:05:38 +00:00
Robin Lee
589b855719
Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev
2016-04-06 17:01:24 +00:00
Adam Powell
3e10ae927c
Fragment#setUserVisibleHint guard
...
Bug 28026606
Change-Id: I109bce6ecd35feaa045b61a7226b2a19344d2cda
2016-04-06 09:57:40 -07:00
