7741 Commits

Author SHA1 Message Date
Michael Wright
e051f6f1fd Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.

Bug: 26830970
Change-Id: I1be541a53e3943d06640169671824f7daea15462
2016-06-04 02:20:21 +01:00
sergeyv
91ae5e8209 Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev am: e4e240f13f am: e136aba4ad
am: e105927fa4

* commit 'e105927fa4f71e74051bf13f87186c2905a14a4b':
  HWUI: do not call glCopyTexSubImage2D on empty area.

Change-Id: I5fe170f0ec7ac82f4502b545fb756cc9df51f0fb
2016-06-02 01:58:15 +00:00
sergeyv
e136aba4ad Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev
am: e4e240f13f

* commit 'e4e240f13f6c64049ef346b27d1cf78699fa800e':
  HWUI: do not call glCopyTexSubImage2D on empty area.

Change-Id: Ica6dcf88c3fea43f07352f460343d97599280cdc
2016-06-02 01:44:06 +00:00
Sergei Vasilinetc
e4e240f13f Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev 2016-06-02 01:36:35 +00:00
sergeyv
ab3f8c2e32 HWUI: do not call glCopyTexSubImage2D on empty area.
Previous check .isEmpty() is not sufficient, because getWidth() may have
value 0.5, so technically it is not empty, but when this size is passed
to texture calls it is converted to uint_32 and it becomes zero.

bug:28941093
Change-Id: Ia7c2bf0340466d5376f235fb5da54ad2ddfa0a03
2016-06-01 23:55:32 +00:00
sergeyv
9751618c87 Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f am: 6544a0e2e2
am: caeade2914

* commit 'caeade2914a4f5366ed89c3e8ba7f188434465c2':
  HWUI: do nothing in case of empty layer

Change-Id: I77de8747f9c7bed869cb1e8a2533e27f01cfe33f
2016-06-01 00:45:15 +00:00
sergeyv
6544a0e2e2 Merge "HWUI: do nothing in case of empty layer" into nyc-dev
am: 21a608f27f

* commit '21a608f27f1f7b9c0fcfbb982f290fed29cc1817':
  HWUI: do nothing in case of empty layer

Change-Id: I264e20e2290f474636a21eb7322377e308d316c2
2016-06-01 00:20:54 +00:00
Sergei Vasilinetc
21a608f27f Merge "HWUI: do nothing in case of empty layer" into nyc-dev 2016-06-01 00:15:32 +00:00
sergeyv
aebbbef565 HWUI: do nothing in case of empty layer
bug:28862058
Change-Id: I8e09a5c33d0eb00a829be4df706dab49cad48b1e
2016-05-31 14:18:02 -07:00
Doris Liu
0794f537da Merge "Copy native tree's property when mutate vector drawable" 2016-05-28 01:11:23 +00:00
Doris Liu
8fc70289b5 Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev
am: fceaa60e24

* commit 'fceaa60e249575021e41b873673e12d9b4123fbe':
  Copy native tree's property when mutate vector drawable

Change-Id: I86969033da46b58268df0ea026749f992068bc2b
2016-05-27 22:22:14 +00:00
Doris Liu
028029730b Copy native tree's property when mutate vector drawable
When mutating vector drawables, we need to not only copy over
the VD tree structure, but also the properties of the VD tree,
such as alpha.

Bug: 28974071
Change-Id: I265e7e3cb92455b876cae248bcb9811230cb34f9
2016-05-27 10:54:55 -07:00
Doris Liu
335d7d1744 Copy native tree's property when mutate vector drawable
When mutating vector drawables, we need to not only copy over
the VD tree structure, but also the properties of the VD tree,
such as alpha.

Bug: 28974071
Change-Id: If793f5f2b6e116472a1c6da0fb60d8278a78b03f
2016-05-26 16:06:58 -07:00
John Reck
e221f808e5 Merge "Add lock-clocks script for bullhead/angler" 2016-05-26 20:52:05 +00:00
Doris Liu
f143417bab Merge "Handle hidden RT VectorDrawable animators" 2016-05-26 20:45:33 +00:00
Doris Liu
67ce99b66e Handle hidden RT VectorDrawable animators
This CL changes the target of VD specific animators to VectorDrawable,
instead of RenderNode. The benefit of doing so is that animators can
now detect whether the animation is meaningful by checking whether
their VD target is in the display list. If not, that means the VD is
not drawing for the current frame, in which case we can be smarter
and more power efficient by removing the animator from the list and
posting a delayed onFinished listener callback.

By setting VD as the animation target, when an ImageView decides to
update its drawable from one AVD to something else, we'll be able
to detect that the previous AVD is no longer in the display list,
and stop providing animation pulse to the stale AVD, which is
something we couldn't do previously.  This change also
handles the case where one AVD instance could be drawn in two
different views.

Bug: 27441375
Change-Id: Id4b3b37f28274c917cb9beb9dcd3d1e6991b5c5d
2016-05-26 11:13:19 -07:00
John Reck
f070a3f2f4 Add lock-clocks script for bullhead/angler
Change-Id: I572a8603368425066c25a4096d09374b177a1be5
2016-05-26 09:48:50 -07:00
Michael Wright
4f6ae7bbaa Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Iede50a709849ed27cb9723a565b946e00fb23be7
2016-05-26 14:39:03 +00:00
Michael Wright
c396f0f70e Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 2016-05-26 14:03:47 +00:00
John Reck
fa29d8c368 Merge "Merge "Fix a translate issue with saveLayer" into nyc-dev am: f4ae997719 am: e5a3df612a" into nyc-mr1-dev-plus-aosp
am: ebe36fb4f7

* commit 'ebe36fb4f7800ae58777809d765ff207a4c30f8f':
  Fix a translate issue with saveLayer

Change-Id: I061f21b1e2ab6764394e9e95d2f2757bb84f6268
2016-05-25 17:32:58 +00:00
John Reck
55c65e0821 Merge "Fix a translate issue with saveLayer" into nyc-dev am: f4ae997719
am: e5a3df612a

* commit 'e5a3df612adb24dbf89ddde96a75f75ff5ffd380':
  Fix a translate issue with saveLayer

Change-Id: Id3051e9bf217d3d24d2662bde0f7a1863efa8c59
2016-05-25 16:51:46 +00:00
John Reck
c57a36a634 Merge "Fix a translate issue with saveLayer" into nyc-dev
am: f4ae997719

* commit 'f4ae9977190d4d406ec5e2aaddb78ea84873f1f0':
  Fix a translate issue with saveLayer

Change-Id: I5ae92450069533898880ab728532657da1dbc399
2016-05-25 16:47:51 +00:00
John Reck
c9bb1a38d3 Fix a translate issue with saveLayer
Bug: 28667141

saveLayer clips the layer to the size it needs to
be and will translate content if necessary, but
the drawLayerOp that results from that was not
translated to handle the shifted draw content.

This fixes that

Change-Id: I3c9ffd5d0282fa1b958bced94c25e9744281e9be
2016-05-24 15:06:01 -07:00
Chih-Hung Hsieh
6a56d2b120 Merge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp am: e60c649ada" into nyc-mr1-dev-plus-aosp
am: ce685d90a5

* commit 'ce685d90a53dd47c9c8d02a8ec5fd4fe59afd77e':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: I08ca821a4d6b9295efc1522c558f3449126ef5f3
2016-05-24 20:36:53 +00:00
Chih-Hung Hsieh
2473acbc0a Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4
am: ba11b8e441

* commit 'ba11b8e441ab8637b377183d2f5941fcc0a37717':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: I848549377eb4ad8834a09ef4f12de52d1fb683c3
2016-05-24 20:03:38 +00:00
Treehugger Robot
c49d21f9c4 Merge "Fix misc-macro-parentheses warnings in common_time." 2016-05-24 19:39:17 +00:00
Adam Lesinski
c7edbbafea Merge "Performance improvements in AssetManager" into nyc-dev am: 3765d34d36 am: 2b798a2344
am: 76308ce86f

* commit '76308ce86f89cf57cd18e0a48a1bf19d669abfcc':
  Performance improvements in AssetManager

Change-Id: I893a8a5e7b81f89b48214f2c6f207663d762b717
2016-05-21 00:22:01 +00:00
Adam Lesinski
76308ce86f Merge "Performance improvements in AssetManager" into nyc-dev am: 3765d34d36
am: 2b798a2344

* commit '2b798a2344feeeb64b74e8dab4042f7d7f3879ab':
  Performance improvements in AssetManager

Change-Id: I01c50ad7695e478f299f497441fdea0ab8e24116
2016-05-21 00:18:30 +00:00
Adam Lesinski
bffbb765d7 Merge "Performance improvements in AssetManager" into nyc-dev
am: 3765d34d36

* commit '3765d34d364e76817e9dbea55819df86d858df10':
  Performance improvements in AssetManager

Change-Id: Id552f8bc9753f2d336ab2e9cf1f05d5e5b2a2409
2016-05-21 00:13:37 +00:00
Adam Lesinski
76da37e1cf Performance improvements in AssetManager
Change the implementation of getLocales() to iterate the set of
configurations using a templated method, instead of using the result
of getConfigurations().

Also remove the check for AndroidManifest.xml when adding an asset path.
This is unneccessary.

Bug:28625993
Change-Id: I16de5da598d0c371421d1dc8eee054dce9baf53a
2016-05-20 15:04:09 -07:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Adam Lesinski
d5bb8487d5 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169
am: f55c9f7aa6

* commit 'f55c9f7aa64660712242705d4e5e89e2191bbf69':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I23f28430cf242be3f77926016626ea3e5705d4ec
2016-05-19 23:34:58 +00:00
Adam Lesinski
6f4b566169 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." 2016-05-19 23:25:09 +00:00
Chih-Hung Hsieh
0a87059452 resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp
Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5
2016-05-19 16:22:09 -07:00
Chih-Hung Hsieh
cef190de85 Fix misc-macro-parentheses warnings in hwui and graphic jni.
Bug: 28705665
Change-Id: I7d1eb38a713fe6cc7f41a3cc3f2f9d0aa0114b2c
2016-05-19 15:25:50 -07:00
Chih-Hung Hsieh
2bd7a3efc4 Fix misc-macro-parentheses warnings in common_time.
Bug: 28705665
Change-Id: Ibdab4631f0e692b8a291faecdeb4a6062f906ea5
2016-05-19 15:21:42 -07:00
Chih-Hung Hsieh
e819d01e3e Fix misc-macro-parentheses warnings in aapt and androidfw.
Bug: 28705665
Change-Id: Iac353e66718aadad384183cf300330695df25909
2016-05-19 15:19:22 -07:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
2016-05-19 15:12:30 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Sergei Vasilinetc
0353c378ba Merge "Add gmock to hwui library" 2016-05-17 21:00:02 +00:00
sergeyv
8bd5edf804 Add gmock to hwui library
Change-Id: I1dec4cd234e5ee8bb01140b969d0cf817a849047
2016-05-17 12:22:55 -07:00
Michael Wright
778e3b91ac DO NOT MERGE Remove Pointer Capture API
The underlying implementation needs to be completely rethought. If a
process crashed while you were in pointer capture mode, you were
pretty much stuck in it. If the mouse happened to move outside of
your bounds right before you called the API, you'd never actually get
an event (whatever it was hovering over would). There's no easy way
for the system to tell you when you enter or exit this mode because
it doesn't actually track who the current request is from.

These are all solvable, but not in the N time frame. Maybe next time.

Bug: 26830970
Change-Id: I03efd63c499b86dc278491ca3284566c1965581f
2016-05-17 18:02:37 +01:00
Michael Wright
f9d9ce7705 DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.

Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
2016-05-17 18:02:32 +01:00
Chris Craik
f6856b0f34 Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5 am: bd2edfca03
am: f075b05d5a

* commit 'f075b05d5a8516ff98d9c25c1b5ac307fdfc234a':
  Fix hw layer overdraw/update visualization

Change-Id: I70968a90dbc3ea13654b7dbb8065d5a577a0f9ae
2016-05-17 00:17:42 +00:00
Chris Craik
bd2edfca03 Merge "Fix hw layer overdraw/update visualization" into nyc-dev
am: 189e3e5ec5

* commit '189e3e5ec5b698f1062fb98692fa75d3750148e0':
  Fix hw layer overdraw/update visualization

Change-Id: Ic4c49b25e0d1709d34974adb828c3ab4644415e5
2016-05-17 00:08:14 +00:00
TreeHugger Robot
189e3e5ec5 Merge "Fix hw layer overdraw/update visualization" into nyc-dev 2016-05-16 23:58:28 +00:00
Chris Craik
3741328947 Fix hw layer overdraw/update visualization
Fixes: 28748255

Change-Id: I83b531cdf5e4407fd17edd72d96e6189924926fa
2016-05-16 13:54:02 -07:00
Chris Craik
76e9903749 Merge "Fix Skia filter behavior test" into nyc-dev am: 0c5bd7dffe am: de6400a282
am: ec51ed4aa7

* commit 'ec51ed4aa774fddb8d8741aaf627730a19fa675d':
  Fix Skia filter behavior test

Change-Id: I832a61ef95dcc998477b10bffa7e3155acc43066
2016-05-13 23:23:18 +00:00
Chris Craik
ec51ed4aa7 Merge "Fix Skia filter behavior test" into nyc-dev am: 0c5bd7dffe
am: de6400a282

* commit 'de6400a2824b4396e971fc5105f6dc29b97cebc7':
  Fix Skia filter behavior test

Change-Id: Ia19db77125a90b546e9766e070917f562c08d49e
2016-05-13 23:20:13 +00:00
Chris Craik
0cf377c6ae Merge "Fix Skia filter behavior test" into nyc-dev
am: 0c5bd7dffe

* commit '0c5bd7dffec8e5a5f21eed79dc827ef809048c2a':
  Fix Skia filter behavior test

Change-Id: I505e0cf42d47afed31dda7dfcae8a890f17f2dff
2016-05-13 23:17:34 +00:00