Commit Graph

7900 Commits

Author SHA1 Message Date
Jorim Jaggi
c2e27322df Merge changes from topic \'recents_transition\' into nyc-dev am: a04c532
am: ea42b59

* commit 'ea42b59a06f27b9ba282b448aec1d93436221711':
  Implement transition for docking task in recents #6
  Implement transition for docking task in recents #5
  Implement transition for docking task in recents #4
  Implement transition for docking task in recents #3
  Implement transition for docking task in recents #2
  Implement transition for docking task in recents #1
  Show a scrim activity if task is not resizable
2016-03-25 22:35:08 +00:00
Jorim Jaggi
ea42b59a06 Merge changes from topic \'recents_transition\' into nyc-dev
am: a04c532

* commit 'a04c532a09b8d946ebc9a086f673220059218869':
  Implement transition for docking task in recents #6
  Implement transition for docking task in recents #5
  Implement transition for docking task in recents #4
  Implement transition for docking task in recents #3
  Implement transition for docking task in recents #2
  Implement transition for docking task in recents #1
  Show a scrim activity if task is not resizable
2016-03-25 22:32:27 +00:00
Edward Cunningham
0ac521ed8c Merge "DO NOT MERGE Revert "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.""" into nyc-dev
am: d0ee17d

* commit 'd0ee17d926cce445bcd22b15e80e725aa4639895':
  DO NOT MERGE Revert "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.""
2016-03-25 22:32:25 +00:00
Jorim Jaggi
a04c532a09 Merge changes from topic 'recents_transition' into nyc-dev
* changes:
  Implement transition for docking task in recents #6
  Implement transition for docking task in recents #5
  Implement transition for docking task in recents #4
  Implement transition for docking task in recents #3
  Implement transition for docking task in recents #2
  Implement transition for docking task in recents #1
  Show a scrim activity if task is not resizable
2016-03-25 22:22:05 +00:00
Edward Cunningham
d0ee17d926 Merge "DO NOT MERGE Revert "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.""" into nyc-dev 2016-03-25 22:01:07 +00:00
Jorim Jaggi
192086eb8a Implement transition for docking task in recents #1
- When the docking transition is happening, defer updating
the bounds of the home stack until the transition is done.
This is to preserve the scrim which is drawn in the recents
activity.
- Use the PROLONG_AT_START infrastructure to hide the task
in recents when starting the app transition.
- When recents finally get resized at the end of the transition,
reset it's draw state so we don't move the old surface around,
and the new surface gets drawn at the new position, to avoid
flickering.
- Remove hack around not layouting docked divider if it's not
visible, it's not needed anymore and resulted in a wrong
initial position.
- Fix animation selection for docked stack divider.
- Make sure win.moved() always gets called.

Bug: 27607141
Change-Id: I76c35f09461f044a90e2c88335008284b5839cc0
2016-03-25 14:27:58 -07:00
Jorim Jaggi
2adba07d75 Show a scrim activity if task is not resizable
Add a callback to TaskStackChangeListener which gets fired when the system
might need to inform the user that a specific app might not work in
multi-window.

Use that callback in SysUI to show a translucent activity which scrims the
activity behind to inform that it might not be resizable.

Debounce the information to once per multi-window session, to not make it
annoying.

Introduce launchTaskId to start an activity in an existing task, and protect
that with START_TASKS_FROM_RECENTS permission.

Bug: 27327287
Bug: 27431869
Change-Id: I89e8d653872ab01ba3c1e252b426e5481da0e6ca
2016-03-25 14:23:41 -07:00
Edward Cunningham
abb2c5af8e DO NOT MERGE Revert "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.""
This reverts commit c6f5738d3c.

Change-Id: Ibb330f44c3910b3fc124ee8c718a508cdf3b32b4
2016-03-25 20:56:31 +00:00
Winson
12fc1b11a6 Merge "Dont scale task thumbnails." into nyc-dev am: 941a1f8
am: fccc734

* commit 'fccc7349aa94e51b6198233533d74a7bacbddb7a':
  Don’t scale task thumbnails.
2016-03-25 03:59:32 +00:00
Winson
fccc7349aa Merge "Dont scale task thumbnails." into nyc-dev
am: 941a1f8

* commit '941a1f81b0f50ff219a38476ffdba062b81d2fc4':
  Don’t scale task thumbnails.
2016-03-25 03:56:48 +00:00
Winson Chung
941a1f81b0 Merge "Don’t scale task thumbnails." into nyc-dev 2016-03-25 03:51:09 +00:00
Winson
217009356e Don’t scale task thumbnails.
- Changing task view thumbnail layout.  In portrait, scale the thumbnail
  to width for portrait screenshots, and apply the same scale to 
  landscape screenshots.  In landscape, scale screenshots up to 1:1, and
  tweak the app transition to clip the sides instead of scaling.
  In both orientations, fill with the background color in the remaining
  space.
- Moving some resources related to the title bar to be calculated 
  programmatically so that we can have different header bar sizes which 
  completely overlap the action bar in the screenshot in each 
  orientation.
- Constraining the task stack width in landscape to portrait

Bug: 27504677
Change-Id: Ic9b6fdde6dd728d9f2d20a8b89c05b3a350edfbf
2016-03-24 20:03:02 -07:00
Svetoslav Ganov
b277ea52eb Merge "Guard against a NPE when using ParceledSliceList" into nyc-dev am: d61a57f
am: d46c5c7

* commit 'd46c5c77aaeb2be6e53d37909fc233254508681e':
  Guard against a NPE when using ParceledSliceList
2016-03-25 01:41:35 +00:00
Svetoslav Ganov
d46c5c77aa Merge "Guard against a NPE when using ParceledSliceList" into nyc-dev
am: d61a57f

* commit 'd61a57fdd035384870de275e36dfc3a2b58b8597':
  Guard against a NPE when using ParceledSliceList
2016-03-25 01:38:52 +00:00
Svetoslav Ganov
d61a57fdd0 Merge "Guard against a NPE when using ParceledSliceList" into nyc-dev 2016-03-25 01:33:38 +00:00
Svetoslav Ganov
b2c2e452e5 Guard against a NPE when using ParceledSliceList
bug:27558595

Change-Id: Idaa3b37d1d3bbb10b93e08ef1976758fde0b0ce3
2016-03-24 18:01:22 -07:00
George Mount
2d5308e196 Merge "Invalidate entire scene root when executing the transition." into nyc-dev am: f189c2f
am: 015651f

* commit '015651fa55b9e7ec05d61ef0d233444536d5111a':
  Invalidate entire scene root when executing the transition.
2016-03-24 14:52:36 +00:00
George Mount
015651fa55 Merge "Invalidate entire scene root when executing the transition." into nyc-dev
am: f189c2f

* commit 'f189c2ffa250d4da27b18263c6876d79610ce6e3':
  Invalidate entire scene root when executing the transition.
2016-03-24 14:50:11 +00:00
George Mount
f189c2ffa2 Merge "Invalidate entire scene root when executing the transition." into nyc-dev 2016-03-24 14:45:22 +00:00
Clara Bayarri
cc80281911 Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev am: 3e5bf78
am: c84e36b

* commit 'c84e36b7ec77e52ab184c1328c55ee71f8ba4aa5':
  Keyboard Shortcuts: plumb deviceId through
2016-03-24 13:41:42 +00:00
Clara Bayarri
c84e36b7ec Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev
am: 3e5bf78

* commit '3e5bf786b7ca36fa0cc150fcd8d0e7a69ecb9db0':
  Keyboard Shortcuts: plumb deviceId through
2016-03-24 13:37:26 +00:00
Clara Bayarri
3e5bf786b7 Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev 2016-03-24 13:30:48 +00:00
Clara Bayarri
fcd7e80b21 Keyboard Shortcuts: plumb deviceId through
Bug: 27673736
Change-Id: Ie72807aa8c2bfd142b081a6a915e101c16d31473
2016-03-24 11:47:32 +00:00
Adam Powell
2ce140df85 Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev am: 30ac43e
am: f26ebfc6

* commit 'f26ebfc6c2ac42ffca127f83615f503276fdc454':
  Fix bugs around restoring nested retained instance fragments
2016-03-23 22:45:33 +00:00
Adam Powell
f26ebfc6c2 Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev
am: 30ac43e

* commit '30ac43e4acc4ed5673ea40d6643e36fadec5411c':
  Fix bugs around restoring nested retained instance fragments
2016-03-23 22:40:03 +00:00
Adam Powell
30ac43e4ac Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev 2016-03-23 22:27:31 +00:00
George Mount
52ff2b7798 Invalidate entire scene root when executing the transition.
Bug 27778109

When switching from forced visibility to using real visibility,
I didn't take into account the fact that invalidating INVISIBLE
Views skip invalidation. This CL invalidates the scene root
to ensure that the transition is properly executed.

Change-Id: I092d0fe42229390927f7d1b65fc2b3ce5fc2938d
2016-03-23 14:01:35 -07:00
Adam Powell
eacacb5989 Fix bugs around restoring nested retained instance fragments
Framework edition

In a few configurations the child fragment state of a
retained-instance fragment would not be preserved correctly, leading
to child fragments not being restored. Clean this up along with live
state management issues that were leading to logged warnings during
normal fragment operation.

Bug 27371492
Bug 27477824

Change-Id: I847ac05b1757392580e008dc20c50c3ef365ca68
2016-03-23 13:07:27 -07:00
Adrian Roos
710f829e6d Merge "Ensure notification color contrast" into nyc-dev am: 9b95f61
am: e933de8

* commit 'e933de8e769fb78d8af8b965d329ab91bccdbd15':
  Ensure notification color contrast
2016-03-23 18:47:54 +00:00
Adrian Roos
e933de8e76 Merge "Ensure notification color contrast" into nyc-dev
am: 9b95f61

* commit '9b95f615c45b2dac053aa45d881f6a4b3c301342':
  Ensure notification color contrast
2016-03-23 18:44:00 +00:00
Adrian Roos
9b95f615c4 Merge "Ensure notification color contrast" into nyc-dev 2016-03-23 18:14:54 +00:00
Adrian Roos
4ff3b120ff Ensure notification color contrast
Ensure we have at least 3:1 contrast for the
action buttons. Also ensures that the inline
reply box background has 4.5:1 contrast to white.

Further modifies the color of the inline reply
background to satisfy a 4.5:1 contrast ratio for
the entered text.

Bug: 26831312
Change-Id: If42b1c99d1adee547d0a583c1a69c48ef7287c23
2016-03-23 10:49:40 -07:00
Michal Karpinski
9e8ccbe43e Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev am: 8aa976b
am: 4a6a538

* commit '4a6a538df979887ddf96e23d42681340c64014c8':
  Remove legacy DeviceLogging methods from DPM
2016-03-23 17:04:29 +00:00
Michal Karpinski
4a6a538df9 Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev
am: 8aa976b

* commit '8aa976b60b0b638a77f9007fa6d1a247815d4b09':
  Remove legacy DeviceLogging methods from DPM
2016-03-23 17:00:44 +00:00
Michal Karpinski
3bce4bfa04 Remove legacy DeviceLogging methods from DPM
Those methods were replaced with SecurityLogging ones.

Bug: 27532425
Change-Id: I6952251d9c15f932517e7cb39a7056f35c3a194f
2016-03-23 13:14:33 +00:00
Paul Stewart
59ff8a11bc Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev am: 68ffbba
am: 366f851

* commit '366f851e35019816f278de6307c5aec87bbe569f':
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
2016-03-22 22:31:06 +00:00
Paul Stewart
366f851e35 Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
am: 68ffbba

* commit '68ffbba158579dd8b6f32aa628ec91228786e864':
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
2016-03-22 22:27:38 +00:00
Paul Stewart
68ffbba158 Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
* changes:
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
2016-03-22 22:23:48 +00:00
Jeff Sharkey
754c8dfea7 Merge "Throw the right exception flavor." into nyc-dev am: 7067487
am: 2a0afa5

* commit '2a0afa58633cf2f7910513575bf67836b62984ff':
  Throw the right exception flavor.
2016-03-22 18:45:46 +00:00
Jeff Sharkey
2a0afa5863 Merge "Throw the right exception flavor." into nyc-dev
am: 7067487

* commit '706748782173d2f02fbbeda1310e09cd033157a3':
  Throw the right exception flavor.
2016-03-22 18:43:01 +00:00
Jeff Sharkey
7067487821 Merge "Throw the right exception flavor." into nyc-dev 2016-03-22 18:39:39 +00:00
Jeff Sharkey
0c2ccd0598 Throw the right exception flavor.
Change-Id: Ie017fce925ed0122d3820c3f3d91e1b86982a7b1
2016-03-22 10:05:47 -06:00
Tony Mak
fe5cd89cb9 Revert getUserInfo change and add isManagedPorfile(int userId) am: 8673b28
am: 438b3f2

* commit '438b3f218dbf3e0fe33676afe5e1e4fcfd4f2dcc':
  Revert getUserInfo change and add isManagedPorfile(int userId)
2016-03-22 15:32:58 +00:00
Tony Mak
438b3f218d Revert getUserInfo change and add isManagedPorfile(int userId)
am: 8673b28

* commit '8673b2899e775014336efff44ea88dcac2b25bdd':
  Revert getUserInfo change and add isManagedPorfile(int userId)
2016-03-22 15:30:21 +00:00
Tony Mak
8673b2899e Revert getUserInfo change and add isManagedPorfile(int userId)
Bug: 26469166
Change-Id: I60b70170ddc80432fc8f638b1f63c4e9f5212785
2016-03-22 15:26:05 +00:00
Benjamin Franz
f6aeab55c4 Merge "Clean up some javadoc issues" into nyc-dev am: 517a958
am: 37c5dff

* commit '37c5dff49de952fbbc7f8ee00d9d0d0399e60fc1':
  Clean up some javadoc issues
2016-03-22 11:40:06 +00:00
Benjamin Franz
37c5dff49d Merge "Clean up some javadoc issues" into nyc-dev
am: 517a958

* commit '517a9583a869ed1913efeb003592db184d1a09e0':
  Clean up some javadoc issues
2016-03-22 11:37:26 +00:00
Benjamin Franz
517a9583a8 Merge "Clean up some javadoc issues" into nyc-dev 2016-03-22 11:30:47 +00:00
Benjamin Franz
ea95624290 Clean up some javadoc issues
Bug: 27672974
Bug: 25881314
Change-Id: Ida53e3bf23b2492c26f4a82878fa192110a8794f
2016-03-22 11:26:48 +00:00
Christopher Tate
f8d09be47e Merge "Add API to read the current wallpaper\'s ID" into nyc-dev am: c823df1
am: 924f6d8

* commit '924f6d87da6ebb75d03760becc99306a1daf5533':
  Add API to read the current wallpaper's ID
2016-03-22 00:10:02 +00:00