Prerepa Viswanadham
d1808401ca
Merge changes from topic 'mwd-merge-050415' into mnc-dev
...
* changes:
Merge commit 'b6f59f4' into master_merge
Merge commit 'f6db0ce' into master_merge
Merge commit '17455a3' into master_merge
Merge commit 'b4d5b32' into master_merge
Merge commit 'a1a2fa7' into master_merge
Merge commit '8dfdb98' into master_merge
Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
Alan Viverette
904de2ec93
Always force constructors accessible during inflation
...
We now correctly throw an IllegalAccessException for non-public accesses,
but we were relying on the old incorrect behavior during inflation. This
CL forces constructors to be accessible so that we emulate the old
behavior and don't crash.
Where we were already doing this, the CL moves the setAccessible() call
immediately after the getConstructor() call, since there's no point in
calling it multiple times.
Bug: 20810495
Change-Id: I63dfcb857e445f688080eea05e86ef22760ed49f
2015-05-04 10:32:57 -07:00
John Reck
05dc201ff6
Merge "Remove Bitmap#getSkBitmap" into mnc-dev
2015-05-04 14:34:52 +00:00
John Reck
1641c0cb0b
Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
2015-05-04 14:34:39 +00:00
John Reck
7c103a36f6
Remove Bitmap#getSkBitmap
...
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
2015-05-01 14:38:44 -07:00
John Reck
c6e2e8ff47
Move AssetAtlas off of SkBitmap*
...
Switched to SkPixelRef*
Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
2015-05-01 14:30:21 -07:00
Chris Craik
31a2d063df
Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
...
Fixes breakage from HwAccelerationTest
This reverts commit b2847afde2 .
Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1
2015-05-01 14:30:15 -07:00
Chris Craik
5c705c595d
Merge "Fix build." into mnc-dev
2015-05-01 21:01:14 +00:00
Chris Craik
b2847afde2
Fix build.
...
Revert "Merge getDisplayList and updateDisplayListIfDirty"
This reverts commit f85d064b53 .
Change-Id: I8b1566aba67c385d72759ea2aea16edcd8477813
2015-05-01 21:01:01 +00:00
Chris Craik
f4ff8f701f
Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
2015-05-01 20:36:22 +00:00
Chris Craik
04c0f415b5
Merge "Update alpha documentation" into mnc-dev
2015-05-01 20:36:03 +00:00
Doris Liu
27cfed7ba5
Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev
2015-05-01 17:54:44 +00:00
John Reck
78760b4ae4
Merge "A bunch more cleanups" into mnc-dev
2015-05-01 14:42:51 +00:00
Alan Viverette
ec48536d30
am 4cff05e1: am 87706358: am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
...
* commit '4cff05e1f7ec780f1ab0b77202453867eaf146f3':
LayoutInflater should always try to generate LayoutParams for include
2015-05-01 01:33:00 +00:00
Doris Liu
6b471995cb
Make sure transform matrix is applied when hardware layer is re-created
...
Bug: 11168275
Change-Id: I9234a2efc7580d27ac8b7f0e60ceed7df23f5f25
2015-04-30 17:16:46 -07:00
Chris Craik
dd2a3bc1ba
Update alpha documentation
...
bug:19412691
bug:20254728
Change-Id: I5bcdd888fb7b6498d43957a3ef32d3ad13683ad0
2015-04-30 16:57:30 -07:00
Chris Craik
f85d064b53
Merge getDisplayList and updateDisplayListIfDirty
...
bug:17767704
Change-Id: I5dffc0fa343d5d67d5fe59c78eca77bb8645ce0e
2015-04-30 16:18:22 -07:00
Mady Mellor
d274400205
resolved conflicts for merge of 04f2fe39 to master
...
Change-Id: I9cd9efb3ead33cef9a0de95417d71d535cbc1bce
2015-04-30 16:17:16 -07:00
John Reck
3731dc220e
A bunch more cleanups
...
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI
Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
2015-04-30 14:34:55 -07:00
Alan Viverette
ac7927a895
Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
2015-04-30 21:03:23 +00:00
Alan Viverette
84aa2fb65a
LayoutInflater should always try to generate LayoutParams for include
...
A recent optimization assumed that layout_width and layout_height always
had to be defined to successfully generate layout params, but this is not
guaranteed to be true for custom ViewGroups.
Bug: 20267738
Change-Id: If09d346f30c0848b984b9137088f8f3b7617cd08
2015-04-30 12:33:54 -07:00
Mady Mellor
e82067b575
Add onStylusButtonPress listener to View
...
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.
If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.
Bug: 19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
2015-04-30 09:58:35 -07:00
Maxim Bogatov
aba56b648f
Merge "Add accessibility actions for scrolling in different directions"
2015-04-30 01:16:02 +00:00
Chris Craik
80a2f50315
am e58e0e50: am 737f0b22: am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev
...
* commit 'e58e0e50efa429b47985acedf3ec7d8d5745ea95':
Unify View alpha implies clipping behavior
2015-04-29 19:56:07 +00:00
Chris Craik
7201bf2b7e
Merge "Unify View alpha implies clipping behavior" into mnc-dev
2015-04-29 19:23:41 +00:00
John Reck
40801e3d21
am 6e51f4bd: am 6c921033: am b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev
...
* commit '6e51f4bd71a7ead84ae35dc56c41b535942a1469':
Remove View:hasStaticLayer()
2015-04-29 15:21:16 +00:00
John Reck
b77a755112
Merge "Remove View:hasStaticLayer()" into mnc-dev
2015-04-29 14:48:28 +00:00
Adrian Roos
33d82aeac3
am 85b9577e: am dffb90fe: am ca067e97: Merge "Rename windowLightStatusBar" into mnc-dev
...
* commit '85b9577e4fd6c8cc3871a81364433078f7517b58':
Rename windowLightStatusBar
2015-04-29 02:24:16 +00:00
Chris Craik
c7850626e4
am 4527289b: am 0e7d1432: am ff623a5a: Merge "Remove unused flags and dirty rects" into mnc-dev
...
* commit '4527289b767865053ef6fa6aaa0a836ecba29dbb':
Remove unused flags and dirty rects
2015-04-29 02:23:51 +00:00
Chris Craik
7ebc0eb243
Unify View alpha implies clipping behavior
...
bug:20254728
Change-Id: If472adf7c75ca9ccfeb0d22e005c1215aacfb80f
2015-04-28 17:14:49 -07:00
Adrian Roos
ca067e9703
Merge "Rename windowLightStatusBar" into mnc-dev
2015-04-28 22:45:01 +00:00
Chris Craik
ff623a5ab3
Merge "Remove unused flags and dirty rects" into mnc-dev
2015-04-28 21:39:49 +00:00
Adrian Roos
f4f84c98de
Rename windowLightStatusBar
...
Bug: 20642760
Change-Id: If961c758bb034ff9643d7b06a2baafe7307f4051
2015-04-28 13:45:51 -07:00
John Reck
c2330f5d46
Remove View:hasStaticLayer()
...
Bug: 19113169
Change-Id: I81286db45eecc92c0adf04a5983b752bf3290d45
2015-04-28 13:18:52 -07:00
Alan Viverette
4344e06c05
am c5378645: am e8518e7e: am f8fdf87c: Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
...
* commit 'c537864580bbb3e272f9e227eba52523c6323731':
Fix handling of android:onClick for ContextWrapper
2015-04-28 18:39:37 +00:00
Alan Viverette
f8fdf87c06
Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
2015-04-28 17:49:20 +00:00
Chris Craik
956f340aac
Remove unused flags and dirty rects
...
bug:17209071
Also update DisplayList->RenderNode naming in Editor
Change-Id: I1d505640ba7388a0b0042d9c787f859e45a24da5
2015-04-28 09:40:01 -07:00
Deepanshu Gupta
b6710d4caa
am cb8ca207: am 9014b31f: am 8381e2cd: Merge "Fix view outline for shadows in LayoutLib." into mnc-dev
...
* commit 'cb8ca207580ddda501336f77f7d1c39519524320':
Fix view outline for shadows in LayoutLib.
2015-04-28 15:15:57 +00:00
Tor Norbye
7b4b844fdf
Merge "Annotate some APIs with threading annotations"
2015-04-27 22:51:35 +00:00
Maxim Bogatov
ac6ffce171
Add accessibility actions for scrolling in different directions
...
b/20157498
ACTION_SCROLL_UP, ACTION_SCROLL_DOWN, ACTION_SCROLL_LEFT and ACTION_SCROLL_RIGHT
actionos were added in addition to ACTION_SCROLL_FORWARD/BACKWARD
Change-Id: I8d5182a8add32085a354b280496b3d38ec79be32
2015-04-27 13:45:58 -07:00
Deepanshu Gupta
dbc7ca0bac
Fix view outline for shadows in LayoutLib.
...
Set the bounds on the drawable before getting the view outline for
shadow. Also, reuse the temp outline object in AttachInfo rather than
allocating a new one each time.
Change-Id: I69793d38d60c5b9f9050569f2b22fbc7b90620bf
2015-04-27 17:19:35 +00:00
Alan Viverette
87cfcaac1b
Fix handling of android:onClick for ContextWrapper
...
DeclaredOnClickListener traverses up the context hierarchy until it
either finds the named method or runs out of contexts.
Bug: 19125347
Change-Id: I565348e2a9f5686d5c8041fbc301d44ec04d5703
2015-04-27 17:14:07 +00:00
Doris Liu
7eaccbfbc2
Remove distance based animation duration API
...
Bug: 20500107
This reverts commit 0084e37095 .
Change-Id: I57f1f3a22c5adfefd966447050b100a50e7141b2
2015-04-23 18:33:39 -07:00
Tor Norbye
83c6896cbf
Annotate some APIs with threading annotations
...
Change-Id: I24bda29261cdecbe78b2529866624b9313ca5c03
2015-04-23 22:14:19 +00:00
Dianne Hackborn
799d8d0a0f
Add "assist block" API.
...
To prevent assist structure traversal down the view hierarchy.
Change-Id: I50ce5f8de6f2eca3cb862de8eacd6422c40a2f7c
2015-04-22 17:36:48 -07:00
Mady Mellor
7c36a685fe
Enable stylus scale by default for apps targeting MNC+
...
Bug: 20467919
Change-Id: Icadd45c8031e362d8101419c298133d59165939b
2015-04-22 11:52:31 -07:00
Mady Mellor
724866172a
Merge "Remove mouse association in scaling, only do it for stylus, update doc."
2015-04-22 16:56:13 +00:00
Mathieu Chartier
7651dec5c9
am 097e1cdf: am 765d7c30: am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
...
* commit '097e1cdfb8f3520b22eafb2f0a7458010b1b3415':
Update getExportedPropertyMethods to new reflection API
2015-04-22 00:00:23 +00:00
Mathieu Chartier
765d7c3048
am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
...
* commit 'ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
Update getExportedPropertyMethods to new reflection API
2015-04-21 23:26:49 +00:00
Chris Craik
6eededad96
Merge "More state cleanup in View#draw"
2015-04-21 21:47:27 +00:00