220723 Commits

Author SHA1 Message Date
Tom Hudson
0f174bb182 Merge "Merge six commits from master-skia to master" 2015-10-29 16:32:12 +00:00
Leon Scroggins III
f35b989d26 Merge six commits from master-skia to master
Also corrects some code under development behind the HWUI_NEW_OPS flags
to match the updated Skia API.

Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap

previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
previous-Change-Id: I85de3462ad1e4877784df38edc4bcd0acbd24e5e
Change-Id: Ide8e2f669e91a13c32521af3a16efdaa085c81d0
2015-10-29 12:29:03 -04:00
John Reck
0529672a8c resolve merge conflicts of a1b8d77ca3 to master.
Change-Id: Ia78c6d31687542dfaba20b177e774333cfb1edb5
2015-10-29 09:05:53 -07:00
Alan Viverette
d8f56833c5 Merge "Show anchored context menu on long press" 2015-10-29 14:24:53 +00:00
Paul Mclean
438c220d78 Merge "Fixing problems with 1st connect of USB audio device to Fugu." 2015-10-29 13:40:47 +00:00
Paul McLean
c15f756443 Fixing problems with 1st connect of USB audio device to Fugu.
Also added some additional logging functions as we are not done
looking at connect/disconnect issues.

Leaving in tact the multi-device connect/disconnect logic (neeeds to
be revisited)

Bug: 24906368
Change-Id: Iff91c51a9c7013dde56182059f3747e1d6cd727b
2015-10-29 13:39:42 +00:00
Svetoslav Ganov
a1b8d77ca3 Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a am: 35151fbc8b
am: 08d013d3a1

* commit '08d013d3a1e6306533c2fae1a4581986ffc9a642':
  Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:33:09 +00:00
Svetoslav Ganov
08d013d3a1 Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a
am: 35151fbc8b

* commit '35151fbc8b028f6633f477fd36044032a03b2bff':
  Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:24:38 +00:00
Svetoslav Ganov
35151fbc8b Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
am: 2658cb002a

* commit '2658cb002abae9341c9a82bfeaed764ba5bf97c8':
  Make SYSTEM_ALERT_WINDOW development permission
2015-10-29 01:16:46 +00:00
Svetoslav Ganov
2658cb002a Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev 2015-10-29 01:10:46 +00:00
Jun Mukai
38a023fad7 Change pointer icon shape for multi window divider.
This depends on If1cd34cc5253c9f8a50decba90498001093a9db7.

Bug: 23193951
Change-Id: I40443356f9151f8a8024f6a62517dd74e68fce41
2015-10-28 17:25:06 -07:00
Jun Mukai
794469916c Merge "Add setPointerShape() to View for customizable pointer icon shape." 2015-10-29 00:16:33 +00:00
Daichi Hirono
3147977a57 Merge "Update JavaDoc in MtpDatabase." 2015-10-29 00:04:58 +00:00
Chong Zhang
bef461f612 Several fixes for saved surface
- Do not save if the exiting app is no longer top of task

- Mark saved surfaces as invalid when recoving memory, they will
  be reclaimed if they're hidden.

- Save surface when visibility changed to GONE

- Discard saved surface after rotation

- Misc minor fixes and clean-up

bug: 19940527

Change-Id: I5760c7a7b4bf37ef6bdd39cae793a97cf7579429
2015-10-28 16:59:28 -07:00
Filip Gruszczynski
7b0181cea9 Merge "Fix bounds of secondary stack when docked one is visible." 2015-10-28 23:43:45 +00:00
Filip Gruszczynski
6b614433f6 Merge "Freeform to recents app transition." 2015-10-28 23:34:57 +00:00
Filip Gruszczynski
ba47f81446 Fix bounds of secondary stack when docked one is visible.
Bug: 25346448
Change-Id: I35f4bc0ae518904b760a38449c2687392dda91f4
2015-10-28 16:13:49 -07:00
Mikhail Naganov
b851929c32 Add new version of WebViewClient.shouldOverrideUrlLoading callback
The new version provides more information about the origin of
the load, which helps making more secure decision on how to proceed
with it.

Bug: 22346196
Change-Id: I27f591bf5e846bde14335a2c929758a2b48d0763
2015-10-28 16:05:41 -07:00
Filip Gruszczynski
7d428c8606 Merge "Fix touching outside of popup not dismissing it." 2015-10-28 23:01:16 +00:00
Winson Chung
7f1a576f59 Merge "Moving static RecentsConfiguration instance to Recents." 2015-10-28 23:00:04 +00:00
Winson
53ec42cb17 Moving static RecentsConfiguration instance to Recents.
- Matches the other static instances

Change-Id: I25bf474ceb0b8d6cc52c22e83273ffb2fb64cc9d
2015-10-28 15:58:10 -07:00
Winson Chung
5dd803c938 Merge "Fixing touch handling on resized tasks." 2015-10-28 22:34:37 +00:00
Dianne Hackborn
4c9564567b Merge "Add some debugging for device idle alarms." 2015-10-28 22:07:33 +00:00
Filip Gruszczynski
f8a2a63202 Fix touching outside of popup not dismissing it.
We only included the exact popup window area for intercepting touches
that would dismiss the popup. We need to intercept the parent area, so
we use the task or stack associated with the window to determine which
touch events to intercept and use as dismiss. This doesn't affect which
touch events will be delivered to the window.

Bug: 25329650

Change-Id: Ie248ec67bb5328fd67b470f556cf206ce888514c
2015-10-28 15:03:29 -07:00
Winson
23afcae844 Fixing touch handling on resized tasks.
- Simplify touch handling just by keeping everything in screen space, 
  and just map to the curve proportionally to the arc length.  This
  makes the movement much closer to that of other lists, and prevents 
  the issue of touches at the top of the stack scrolling along the 
  curve faster than at other places (and when Recents is resized, this
  becomes more of an issue).
- Add basic functionality (disabled) for freeform task workspaces.


Change-Id: Ib3a8ce2caa1437cfc09eaa5b36aff310e29e35f5
2015-10-28 14:55:47 -07:00
Alan Viverette
2e9aa6fc40 Merge "Apply density scaling in LayerDrawable and subclasses" 2015-10-28 20:50:38 +00:00
Paul Mclean
80de4ef7bd Merge "Fixed capture-only devices not removed when disconnected." 2015-10-28 20:49:10 +00:00
Tom Hudson
1de39f1563 Merge "Revert "Merge six commits from master-skia to master"" 2015-10-28 20:48:05 +00:00
Alan Viverette
0cacad7023 Apply density scaling in LayerDrawable and subclasses
Bug: 25081461
Change-Id: I48e62caf5017ff2dd84cf62b68a828f4542b6ae5
2015-10-28 16:37:25 -04:00
Tom Hudson
d8f904f256 Revert "Merge six commits from master-skia to master"
This reverts commit 550780745fa28ae9a87d02331841ca5ce4f9c763.

Change-Id: Ic71eccea454b26261fe6e9a9a7a24eff56396989
2015-10-28 20:35:36 +00:00
Paul McLean
e3b077b1c6 Fixed capture-only devices not removed when disconnected.
I have brought shame upon my family.

Bug: 24932354
Change-Id: I0fce40a976f40e74f4fd87eb6f4aa93e847032cc
2015-10-28 13:39:44 -06:00
John Reck
97c92659fa Merge "Tune scheduling a bit, avoid a binder ipc" 2015-10-28 19:24:45 +00:00
John Reck
e486d932ca Tune scheduling a bit, avoid a binder ipc
Don't query running behind if it's not possible to be behind such
as having received a vsync since the last call to swap buffers.

This also avoids an accidental-starvation issue where if surface
flinger was a bit sluggish to dequeue then renderthread would drop
thinking the queue was full.

Also be a bit smarter about tracking if we've already drawn for this
vsync target to avoid producing two frames for the same vsync

Change-Id: Ib266500a693c27000b2e8ea578f111229d75147a
2015-10-28 12:24:13 -07:00
John Reck
3398abb25b Merge "Cleanups" 2015-10-28 19:21:17 +00:00
John Reck
9f091287b1 Merge "Free DisplayListData for Views with GONE parents" 2015-10-28 19:20:49 +00:00
John Reck
9dea0d53f5 Free DisplayListData for Views with GONE parents
Bug: 22565656
Change-Id: I06060e6ae473482ec79feb891f9123c85706237f
2015-10-28 12:20:20 -07:00
Geoff Mendal
39baa9d45b Merge "Import translations. DO NOT MERGE" 2015-10-28 19:14:30 +00:00
Jason Monk
7917546d0e Merge "Some header layout cleanup and alignment" 2015-10-28 19:13:58 +00:00
Geoff Mendal
7d0a01ea47 Import translations. DO NOT MERGE
Change-Id: I0bd4c7f9ebf574e04f4717cff2dc5f2b25920bbf
Auto-generated-cl: translation import
2015-10-28 12:12:07 -07:00
Anthony Hugh
6cb3ee8319 Merge "Update permission label strings" into cw-e-dev am: b69cab65d1 am: 41579ff8fc
am: d592a5a43a

* commit 'd592a5a43ac9fa922c8747f2ff6e65cb27ff0b75':
  Update permission label strings
2015-10-28 18:47:53 +00:00
Anthony Hugh
d592a5a43a Merge "Update permission label strings" into cw-e-dev am: b69cab65d1
am: 41579ff8fc

* commit '41579ff8fc06ad655e158b1ab825624437489c83':
  Update permission label strings
2015-10-28 18:38:32 +00:00
Anthony Hugh
41579ff8fc Merge "Update permission label strings" into cw-e-dev
am: b69cab65d1

* commit 'b69cab65d180c3166ac84e47da0aa0c1c27bbc67':
  Update permission label strings
2015-10-28 18:29:06 +00:00
Anthony Hugh
b69cab65d1 Merge "Update permission label strings" into cw-e-dev 2015-10-28 18:22:41 +00:00
Tom Hudson
37028137f2 Merge "Merge six commits from master-skia to master" 2015-10-28 17:56:10 +00:00
Ching Tzung Lin
e29953c175 Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e am: c45009906a
am: a05beb29da

* commit 'a05beb29dac5c05a610783469566cf865d92a140':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset
2015-10-28 17:48:28 +00:00
Chris Craik
346b38cd10 Merge "Rework receiver/dispatcher design slightly, and replace Layer usage." 2015-10-28 17:43:11 +00:00
Leon Scroggins III
550780745f Merge six commits from master-skia to master
Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap

Change-Id: I519f54f97321a7a365ea81a3b78cb03b9bdca021
previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
2015-10-28 13:41:38 -04:00
Ching Tzung Lin
a05beb29da Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e
am: c45009906a

* commit 'c45009906ade7b25b6c01c02113c044bd9290ffb':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset
2015-10-28 17:41:24 +00:00
Ching Tzung Lin
c45009906a Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
am: 36da2a208e

* commit '36da2a208e253d0635bb569cb92ea0e11f489b4e':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset
2015-10-28 17:33:03 +00:00
Ching Tzung Lin
36da2a208e Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev 2015-10-28 17:25:24 +00:00