Commit Graph

8103 Commits

Author SHA1 Message Date
Amith Yamasani
8528648384 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev am: 0cc0381
am: 597965f

* commit '597965f5384b5f4f77ae4ef39e8db799529ab46d':
  Improved javadoc for onLocalVoiceInteractionStopped

Change-Id: Ida3e6c5ce407007955eb1533f13d6465e194937c
2016-04-09 05:58:21 +00:00
Julia Reynolds
c54a7d7b76 Merge "Allow the ranker to autobundle notifications." into nyc-dev am: 3898db9
am: af343d6

* commit 'af343d6796eb0996d134bd606b76b6b2ee5bb185':
  Allow the ranker to autobundle notifications.

Change-Id: I9b5011fa6261d8717db66c5786b51679188f6d8c
2016-04-09 05:53:09 +00:00
Dianne Hackborn
15a3cde2a1 Merge "Fix issue #28075893: Don\'t hold strong refs on to JobService" into nyc-dev am: 6827db3
am: 97907066

* commit '97907066c6cf19eb85607798a41a6f002fb4ea1a':
  Fix issue #28075893: Don't hold strong refs on to JobService

Change-Id: I44ac8048311da7e3ea274b532c25e150e2b044ce
2016-04-09 05:50:53 +00:00
Andrii Kulian
04154a27ae Merge "Fix multiple configuration changes in multiwindow" into nyc-dev am: 21400cb
am: d4b770e

* commit 'd4b770e16e875a8c6339c40d90dc27e2791e9631':
  Fix multiple configuration changes in multiwindow

Change-Id: I7c8b421a3437fca2a7dd82ab5cf46b8a0bc06831
2016-04-09 05:49:24 +00:00
Amith Yamasani
597965f538 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev
am: 0cc0381

* commit '0cc0381714f0356dd6cece201265b368fa2706b6':
  Improved javadoc for onLocalVoiceInteractionStopped

Change-Id: I81a9d06e3ce67859f32476f7a5c2c3b87e6f8d4f
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

* commit '3898db9e152ff8e2b34ae97f4a2ed37b9cb667db':
  Allow the ranker to autobundle notifications.

Change-Id: I652a43365b8eee51e91ed1c5d22aacb1b488e373
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

* commit '6827db3e5fccb5185009ad5ac6a9e30d17573bf2':
  Fix issue #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

* commit '21400cb552f5dc7f4c8296be53fabaa46b03fa85':
  Fix multiple configuration changes in multiwindow

Change-Id: I01db63f6b8899ad04fad72b759611a550b3b42ac
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
183ae07bd4 Merge "Throw security exception for non-parent aware APIs" into nyc-dev am: 5c1fbad
am: 1acb890

* commit '1acb89035105ae0c4ec16cfab6f792ae1791e765':
  Throw security exception for non-parent aware APIs

Change-Id: I65709d7957570e97d5dcfcb81cc75fe3686129c4
2016-04-08 12:12:45 +00:00
Benjamin Franz
1acb890351 Merge "Throw security exception for non-parent aware APIs" into nyc-dev
am: 5c1fbad

* commit '5c1fbadb1a1169186b7a0a357ae9c35183258c6c':
  Throw security exception for non-parent aware APIs

Change-Id: Ibfddb4d0894644adec0ea5aa9e9c7e55431ce5be
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
f7ff639e26 Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev am: 7c3912e
am: 220a909

* commit '220a9090ac24879c0a990d2a0eb0dac588e6166b':
  Dismiss docked stack when opening non-resizable activity

Change-Id: Ie0c301132353d45a3337e21303514780a2197e69
2016-04-07 23:56:52 +00:00
Jorim Jaggi
220a9090ac Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev
am: 7c3912e

* commit '7c3912e4abc71886ad41e7be67d4eff41974d21f':
  Dismiss docked stack when opening non-resizable activity

Change-Id: I3c4953fdafc45b55217c9362799f88aeb23ca799
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
a7b7449fec Merge "Improve service start/creation tracing." into nyc-dev am: d8ca02f
am: f2a63fd

* commit 'f2a63fda7de06af41fdc76b200bcec921011486b':
  Improve service start/creation tracing.

Change-Id: I495a4b87a51df0d0a40a529a3901aec5aea7af8e
2016-04-07 23:34:01 +00:00
Tim Murray
f2a63fda7d Merge "Improve service start/creation tracing." into nyc-dev
am: d8ca02f

* commit 'd8ca02f25225a033ad0f69e1ad4a2af5df289db2':
  Improve service start/creation tracing.

Change-Id: I8bb66e4d51d05d98474d84d901182c52f98c4c4c
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
Alexander Hills
126709f314 Merge "Adds support for MessagingStyle" into nyc-dev am: 5418765
am: 52546b0

* commit '52546b014beb0a6288f8397707baa3ff5b8eb19d':
  Adds support for MessagingStyle

Change-Id: I483ff9ddbb66523272da4a8d5c71448b12f99d11
2016-04-07 20:12:10 +00:00
Alex Hills
52546b014b Merge "Adds support for MessagingStyle" into nyc-dev
am: 5418765

* commit '5418765d4d0e4befef811c0a2cbc5d8a69ed6cfd':
  Adds support for MessagingStyle

Change-Id: I77354888ee4a6292896b0a6b5e85cee4f63af606
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
9711357736 Merge "Allow tests to change UiAutomation flags." into nyc-dev am: d408b99
am: 8c1e665

* commit '8c1e665bc58e6c883f0f5a939dbb777da383ce96':
  Allow tests to change UiAutomation flags.

Change-Id: Ibd6faa5f061ff88dc09310bf36b7f2a10212a8f1
2016-04-07 16:51:49 +00:00
Phil Weaver
8c1e665bc5 Merge "Allow tests to change UiAutomation flags." into nyc-dev
am: d408b99

* commit 'd408b995c32710f8306af83c13cccdfa70cca242':
  Allow tests to change UiAutomation flags.

Change-Id: I2b59047a63905fd8c41e08d6aa140be10c463de9
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
d48a049fa3 Merge "Fix work profile screen timeout policy" into nyc-dev am: bdc3961
am: 869ecf2

* commit '869ecf225a6c6adb5d5dfe738e6d24ee0f41b1e7':
  Fix work profile screen timeout policy

Change-Id: I9664923b282f7b19f7a5a780977dedafa763d343
2016-04-07 16:31:23 +00:00
Ricky Wai
869ecf225a Merge "Fix work profile screen timeout policy" into nyc-dev
am: bdc3961

* commit 'bdc3961fef7b57f98bd6091b79fb511081237d8e':
  Fix work profile screen timeout policy

Change-Id: I4ebf3e47cfadcfe3f689e28f2a487c384278fb83
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
Alexander Hills
e9765a3c3a Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev am: a5ec16e
am: 9f1e6de

* commit '9f1e6de054f836e3b35bb96998c1400435cd5d7a':
  Adds a content-intent-launching-activity flag to WearableExtender

Change-Id: If09863a35440db6b0fc10c021226c9b61b52283f
2016-04-07 14:03:06 +00:00
Alex Hills
9f1e6de054 Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev
am: a5ec16e

* commit 'a5ec16e367637ba0638f906615cbfef6f4d85d13':
  Adds a content-intent-launching-activity flag to WearableExtender

Change-Id: I7af69f8e647d055a2ee9e0ac66aec7d9ee140f0b
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
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
442e05139d Merge "Changed the default if the notification time is shown" into nyc-dev am: f2a587b
am: 1c81841

* commit '1c81841e06b7174d69d127709648e8c541c8d2db':
  Changed the default if the notification time is shown

Change-Id: Ia38e316076334d60fd543a6b1675c31c7bcc58ab
2016-04-06 20:56:47 +00:00
Selim Cinek
4b47ff616e Merge "Deprecated the contentinfo and the number" into nyc-dev am: 82404bc
am: ac51be5

* commit 'ac51be5b1cd048397ed9e4e0e7d6bac5b3610394':
  Deprecated the contentinfo and the number

Change-Id: I6acb57542bba80a9d4e8fadfbd480c3b3102ff3b
2016-04-06 20:56:42 +00:00
Selim Cinek
1c81841e06 Merge "Changed the default if the notification time is shown" into nyc-dev
am: f2a587b

* commit 'f2a587b424586ad9b0a47d022507b87a4ca96c32':
  Changed the default if the notification time is shown

Change-Id: Iae09b0652d7f392052332c7ef9114037cd0c147f
2016-04-06 20:51:46 +00:00
Selim Cinek
ac51be5b1c Merge "Deprecated the contentinfo and the number" into nyc-dev
am: 82404bc

* commit '82404bc0689aceb328a29fe17c277091ce793fa8':
  Deprecated the contentinfo and the number

Change-Id: I4ab5ddb1fa42221377d5603e89dfea84425344fe
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