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
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
Julia Reynolds
7f713ab1c3
Merge "Documentation update for interruption filters." into nyc-dev
...
am: fa305fc
2016-04-06 15:41:13 +00:00
Julia Reynolds
fa305fcc6b
Merge "Documentation update for interruption filters." into nyc-dev
2016-04-06 15:34:09 +00:00
Robin Lee
ee5eb934e3
Remove bool return from setAlwaysOnVpnPackage
...
Bug: 27533151
Change-Id: I4c656488e69cb5247dbb9cfd62d6f6f7043f9a90
2016-04-06 16:30:22 +01:00
Julia Reynolds
dd0605b052
Documentation update for interruption filters.
...
Bug: 27901142
Change-Id: I977f7dc4010dc826e06dfb01ad6db68380b80fde
2016-04-06 10:33:14 -04:00
Benjamin Franz
9c17111358
Merge "Document which APIs are callable on the parent instance" into nyc-dev
...
am: 4a53c8e
2016-04-06 12:23:01 +00:00
Benjamin Franz
4a53c8e702
Merge "Document which APIs are callable on the parent instance" into nyc-dev
2016-04-06 12:17:26 +00:00
Benjamin Franz
66b45f01ff
Document which APIs are callable on the parent instance
...
In DPM it is possible to retrieve a parent instance to set policies
that are applied to the profile parent. Extend the javadoc to clarify
which APIs are actually callable on the parent instance.
Bug: 27532279
Change-Id: I7ed40f8c3c7c3089283489bff41a04c70239d5a4
2016-04-06 11:59:49 +01:00
Christopher Tate
1ecb55a2be
Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev
...
am: 71f4e14
2016-04-05 23:24:59 +00:00
Chris Tate
71f4e14402
Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev
2016-04-05 21:51:20 +00:00
George Mount
5f2be085d2
Merge "Restore fragment transaction animation state information." into nyc-dev
...
am: dc63f7c6
2016-04-05 17:36:11 +00:00
George Mount
dc63f7c624
Merge "Restore fragment transaction animation state information." into nyc-dev
2016-04-05 17:27:34 +00:00
Tony Mak
089d840383
xxxTrustAgentConfiguration should be supported in the parent DPM instance
...
1. Fix trust agent config does not persist across reboot
2. xxxTrustAgentConfiguration now supported in parent DPM instance
Bug: 27601827
Change-Id: I6ea4a089bf590d6c44be40318f3a69c35c54f796
2016-04-05 17:42:55 +01:00
Robin Lee
892af97b0b
Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev
...
am: 691b1a6
2016-04-05 14:13:30 +00:00
Robin Lee
691b1a6005
Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev
2016-04-05 14:04:40 +00:00
Adam Lesinski
ea0186c2c1
Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev
...
am: a149c42
2016-04-05 02:28:26 +00:00
Adam Lesinski
a149c42071
Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev
2016-04-05 02:22:52 +00:00
Phil Weaver
d8e88836fe
Allow tests to change UiAutomation flags.
...
Changing Instrumentation to modify the existing
UiAutomation when one with different flags is requested.
Also checking if UiAutomation is destroyed before disconnecting at the
end of a test.
Bug: 27365874
Bug: 27864279
Change-Id: Ia6efc4f89cc30dbe29286f30f8e9cb8f6fdb4712
2016-04-04 17:52:17 -07:00
Adam Lesinski
3ad1b4899f
Fix issue with overridden configuration in onConfigurationChanged
...
When using applyOverrideConfiguration, subsequent callbacks to
onConfigurationChanged didn't take into account the locally overridden
configuration. This patches the incoming configuration to match
what is expected by the application.
Bug:27644297
Change-Id: I3a090e9862a56470d999aa0aa4d5bae29f533a11
2016-04-04 15:24:48 -07:00
Christopher Tate
d43879c5e4
API feedback: clarify onQuotaExceeded() documentation
...
Bug 27530914
Change-Id: I5d185cfe9c7e0392a26d84e0e60d210ed6755016
2016-04-04 12:54:43 -07:00
George Mount
41fb99480c
Restore fragment transaction animation state information.
...
Bug 17487986
Change-Id: Ic5154b0dd00f07804a1008f8b9f8328f1b2ec06c
2016-04-04 12:32:44 -07:00
Jeff Sharkey
7fc8b9ce48
Merge "Support direct-boot tests." into nyc-dev
...
am: 7d718bb
* commit '7d718bb252fe2bdee0c9c728a1e6e4892deb8ac7':
Support direct-boot tests.
Change-Id: I65205c39260d68130de4787eb2be724006ff8a66
2016-04-03 04:07:02 +00:00
