Deepanshu Gupta
02cab444fb
am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
...
automerge: f4d3973a0bc2e7e
2015-01-05 23:39:03 +00:00
Deepanshu Gupta
f4d3973c31
am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
...
* commit '9c8f8ed8a8bee42ee48a27b055b11ace6255d09a':
resolved conflicts for a0bc2e7e
2015-01-05 23:36:57 +00:00
Chris Craik
a609028451
Merge "Make DisplayListRenderer inherit from Canvas, merge JNI"
2015-01-05 23:31:30 +00:00
Deepanshu Gupta
9c8f8ed8a8
am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
...
* commit '4a5baeaec9294dbb43fe3b36a44b3176101756b6':
resolved conflicts for a0bc2e7e
2015-01-05 23:30:18 +00:00
Deepanshu Gupta
4a5baeaec9
Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
2015-01-05 23:26:04 +00:00
Tom Hudson
8dfaa49042
Make DisplayListRenderer inherit from Canvas, merge JNI
...
Incrementally unify the upper layers for Skia and HWUI.
Remove redundant code from GLES20Canvas.java; instead
use inherited mNativeCanvasWrapper and superclass method
definitions.
Moves some unrelated SkPaint utility functions from Renderer
to new utils/PaintUtils.
bug: 15672762
Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
2015-01-05 15:25:41 -08:00
Filip Gruszczynski
2b37034c57
am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
...
automerge: 62ab1ca
2015-01-05 22:59:09 +00:00
Filip Gruszczynski
62ab1caa38
am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
...
* commit '8117eda6f18a4d388a12ab0af318c95b86280084':
Add system api for disabling touch events in wallpaper behind the window.
2015-01-05 22:56:09 +00:00
Filip Gruszczynski
8117eda6f1
am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
...
* commit '8c6b59f46da3e65ce157fe40a08f1c1fbba3e1c2':
Add system api for disabling touch events in wallpaper behind the window.
2015-01-05 22:50:29 +00:00
Filip Gruszczynski
8c6b59f46d
Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
2015-01-05 22:46:14 +00:00
Alan Viverette
8a3323adc8
am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
...
automerge: 4d41e49
2015-01-05 22:40:24 +00:00
Alan Viverette
4d41e49f39
am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
...
* commit 'bde76419c1c30aa574f8bc7b3f09f2029e080b83':
Avoid double-translating View background
2015-01-05 22:38:57 +00:00
Alan Viverette
bde76419c1
am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
...
* commit '1f3f47b3680547dbb764db173e02d833e12d65a2':
Avoid double-translating View background
2015-01-05 22:32:10 +00:00
Alan Viverette
1f3f47b368
Merge "Avoid double-translating View background" into lmp-mr1-dev
2015-01-05 22:26:54 +00:00
Alan Viverette
b15703c9b4
Avoid double-translating View background
...
Reverse-translate the canvas before passing to Drawable.draw() so that
we don't double-apply the drawable's translation.
BUG: 18904688
Change-Id: I8450de9b240ddeae887b4e1003c0608da814a001
2015-01-05 14:20:42 -08:00
Alan Viverette
7768fd2f8e
am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
...
automerge: 74882cb
2015-01-05 21:50:18 +00:00
Alan Viverette
74882cb0e3
am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
...
* commit 'bf80d2737fc59e8ae04875edddf1534c6a7739bc':
Don't override dialog icon drawable unless valid resource ID was set
2015-01-05 21:48:58 +00:00
Alan Viverette
bf80d2737f
am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
...
* commit '748902420d26b2868296303be7df89d0c25b7f2b':
Don't override dialog icon drawable unless valid resource ID was set
2015-01-05 21:43:27 +00:00
Alan Viverette
748902420d
Merge "Don't override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
2015-01-05 21:39:13 +00:00
Filip Gruszczynski
fe56835934
Add system api for disabling touch events in wallpaper behind the window.
...
Bug: 18721756
Change-Id: I40b749a9916536d52042e5dd49a23575bedad754
2015-01-05 12:57:19 -08:00
Alan Viverette
5c2d8f7d51
Don't override dialog icon drawable unless valid resource ID was set
...
Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.
BUG: 18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
2015-01-05 12:56:45 -08:00
Alan Viverette
a1d11273d3
am 154d251e: am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev
...
automerge: 3f5f13d
2015-01-05 20:36:30 +00:00
Alan Viverette
3f5f13d7ef
am 154d251e: am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev
...
* commit '154d251ee61ad9c3d64b5c6db2d74806f4fd5782':
Fix selector bug
2015-01-05 20:34:08 +00:00
Alan Viverette
154d251ee6
am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev
...
* commit '22a3163f1da8387e42c68c459f5667ac10744a3c':
Fix selector bug
2015-01-05 20:28:06 +00:00
Alan Viverette
22a3163f1d
Merge "Fix selector bug" into lmp-mr1-dev
2015-01-05 20:23:47 +00:00
Alan Viverette
f35d2a0cb4
am db7eefbb: am dd508581: Use min when comparing AM and PM text lengths
...
automerge: 97b2d18
2015-01-05 20:14:32 +00:00
Alan Viverette
97b2d185b6
am db7eefbb: am dd508581: Use min when comparing AM and PM text lengths
...
* commit 'db7eefbbfdc8c77c03b43fd58bcd461b8e52b20e':
Use min when comparing AM and PM text lengths
2015-01-05 20:11:57 +00:00
Alan Viverette
db7eefbbfd
am dd508581: Use min when comparing AM and PM text lengths
...
* commit 'dd508581216ef3ef47bd474316232f269db43f03':
Use min when comparing AM and PM text lengths
2015-01-05 20:06:32 +00:00
Alan Viverette
dd50858121
Use min when comparing AM and PM text lengths
...
Also cleans up code a little to prevent unnecessary re-computation
of lower-cased strings and use final where possible.
BUG: 18874813
Change-Id: I852eb7a281aed64ac36e95f32f5fa410f50abfa4
2015-01-05 11:28:12 -08:00
Alan Viverette
d6ebb3a75e
Remove null entries from constant state cache
...
We insert null entries on cache miss, which can cause NPE on prune, but
we ought to remove these entries during prune.
BUG: 18842826
Change-Id: I9c0bca04f34575d1403de943abd8d12b18c9c032
2015-01-05 11:09:29 -08:00
Brian Attwell
74f89e78b0
Unhid ChangeScroll
...
ChangeScroll is already publicly usable via transition
xml files. This directly unhides the java class.
Bug: 18777272
Change-Id: I3b9982dc4ff3f4e8752b39ee6eb67b617073e2ff
2015-01-05 18:48:49 +00:00
Jinsuk Kim
a8f6c40f8a
am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev
...
automerge: fe3cdf0
2015-01-05 07:25:06 +00:00
Jinsuk Kim
fe3cdf015e
am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev
...
* commit '877919bb182dbd8c87901cb94f318cf5d5408bc8':
CEC: Let MHL device be of type 'source'
2015-01-05 07:23:05 +00:00
Jinsuk Kim
877919bb18
am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev
...
* commit '6cfb44952a76303fe1c7cc75b545cb8aad72eecf':
CEC: Let MHL device be of type 'source'
2015-01-05 07:16:24 +00:00
Jinsuk Kim
e416d0f67b
CEC: Let MHL device be of type 'source'
...
MHL devices should be of type source that can stream AV contents
to the connected TV. This should be supported by the API
HdmiDeviceInfo.isSourceType().
Bug: 18897172
Change-Id: I7dcbd7773127bf26797c204504a12c3e2ebbd83b
2015-01-05 16:07:28 +09:00
Narayan Kamath
fc7bfe6973
am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"
...
automerge: 0699722
2015-01-02 10:36:08 +00:00
Narayan Kamath
0699722a13
am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"
...
* commit '3d6cfe0eb1c9fcfabaf7b02548dd6d5cc16203d6':
fix issuse 65774
2015-01-02 10:34:03 +00:00
Paul Quei
65e37ee936
fix issuse 65774
...
"Some vendors have there own well defined specifications ...". Should be "Some vendors have their own well defined specifications ..."
Change-Id: I0d770ac0591812c1c61389eb0078493098784323
Signed-off-by: Paul Quei <paulquei@gmail.com >
2015-01-02 10:21:55 +00:00
Deepanshu Gupta
f5b02eb7c4
resolved conflicts for a0bc2e7e to lmp-mr1-dev
...
The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.
This change also fixes the typo in the original change which was fixed
in a subsequent change.
Original commit: 12b6d29b7bcb09bc45c5
2014-12-30 14:07:29 -08:00
Michael Wright
3979c0bf42
resolve merge conflicts of 342e903 to master.
...
Change-Id: Id8404cce5c1c8e7818e5d164f93207a8c17cf7bb
2014-12-30 12:59:10 -08:00
Michael Wright
342e903000
am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev
...
* commit '95700457139803af54a5e731816cedf1c924f3a6':
Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
2014-12-30 19:51:20 +00:00
Michael Wright
9570045713
am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev
...
* commit 'a33424a540ea725d4b513ee713931c66e62721a2':
Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
2014-12-30 19:45:47 +00:00
Michael Wright
a33424a540
Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev
2014-12-30 19:40:52 +00:00
Svetoslav
64e5f085a7
am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager.
...
automerge: 1261ee8
2014-12-29 18:32:28 +00:00
Svetoslav
1261ee87a8
am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager.
...
* commit '72da9ed8867a3b3d6a9ae829b9a0ae526c16915c':
Fix a race in accessibility manager.
2014-12-29 18:30:47 +00:00
Svetoslav
72da9ed886
am e5ea48a7: Fix a race in accessibility manager.
...
* commit 'e5ea48a7fe295a2815bab57f2e870901ce48b312':
Fix a race in accessibility manager.
2014-12-29 18:23:54 +00:00
Svetoslav
e5ea48a7fe
Fix a race in accessibility manager.
...
The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.
bug:18840784
Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb
2014-12-29 09:40:46 -08:00
Narayan Kamath
972c24291e
am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."
...
automerge: 1539c26
2014-12-29 12:21:25 +00:00
Narayan Kamath
1539c267c7
am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."
...
* commit 'be8053a23c0f0b15697176f0cd5e322b30d474e1':
Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
2014-12-29 12:20:16 +00:00
Narayan Kamath
5ae63a258b
Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."
2014-12-29 12:08:58 +00:00
