OSDN Git Service
RoboErik [Fri, 21 Feb 2014 18:30:38 +0000 (10:30 -0800)]
Move Session apis to android.media.session
This is to make it easier to distinguish the new apis from the old
ones.
Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
Alan Viverette [Fri, 21 Feb 2014 19:13:16 +0000 (19:13 +0000)]
Merge "Fix scrolling when the bound target offset is too high"
Alan Viverette [Fri, 21 Feb 2014 19:11:01 +0000 (11:11 -0800)]
Fix scrolling when the bound target offset is too high
BUG:
13033556
Change-Id: I7a61548d3c604f004726117b40882f84ddf75337
Alan Viverette [Fri, 21 Feb 2014 18:49:17 +0000 (18:49 +0000)]
Merge "Invalidate projection receiver, refactor invalidate methods"
Ruben Brunk [Fri, 21 Feb 2014 18:25:26 +0000 (10:25 -0800)]
camera3: Fix raw/DNG tag visibilility.
Change-Id: Ie3beed773b27bf56689a750e695ac7cb82580639
Ruben Brunk [Fri, 21 Feb 2014 18:07:04 +0000 (18:07 +0000)]
Merge "camera3: Add green split property."
Elliott Hughes [Fri, 21 Feb 2014 17:37:58 +0000 (17:37 +0000)]
am
48dcf9d5: am
d7d37256: am
b2f07b27: am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
48dcf9d5f59acf53a3ac0eda141ec323534a3321':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:37:54 +0000 (17:37 +0000)]
am
0047d3e0: am
e253b514: am
29d60b95: am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
0047d3e025b43fd2dc05734f7ea6229291445046':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:33:41 +0000 (17:33 +0000)]
am
d7d37256: am
b2f07b27: am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
d7d37256c4bab388e99dae5e16b80a59756cc97d':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:33:38 +0000 (17:33 +0000)]
am
e253b514: am
29d60b95: am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
e253b514f4ef74a23c784d2cd893eb035d1c793f':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:28:54 +0000 (17:28 +0000)]
am
b2f07b27: am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
b2f07b27725bed9716114c46df2cf636eb366f6f':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:28:51 +0000 (17:28 +0000)]
am
29d60b95: am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
29d60b95fa8019c0542f46551057c4d376bb8a7a':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:25:54 +0000 (09:25 -0800)]
am
4a809272: Merge "Fix documentation for Parcel.readException()."
* commit '
4a80927241b3168d9d5138c46c22385d6467a736':
Fix documentation for Parcel.readException().
Elliott Hughes [Fri, 21 Feb 2014 17:25:50 +0000 (09:25 -0800)]
am
8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '
8d41e653bae240488281d430309e2d501e9524e5':
Miscellaneous small documentation fixes.
Elliott Hughes [Fri, 21 Feb 2014 17:21:52 +0000 (17:21 +0000)]
Merge "Fix documentation for Parcel.readException()."
Elliott Hughes [Fri, 21 Feb 2014 17:19:21 +0000 (17:19 +0000)]
Merge "Miscellaneous small documentation fixes."
Robin Lee [Fri, 21 Feb 2014 17:16:11 +0000 (17:16 +0000)]
Merge "Check DeviceOwner exists before using packageName"
Craig Mautner [Fri, 21 Feb 2014 17:06:08 +0000 (17:06 +0000)]
am
c72f5c2d: am
ec5c3b90: am
c2c0a61c: Add copyright notice to files missing them.
* commit '
c72f5c2de565ab3c46176155f3414cc154b5df39':
Add copyright notice to files missing them.
Craig Mautner [Fri, 21 Feb 2014 17:01:48 +0000 (17:01 +0000)]
am
ec5c3b90: am
c2c0a61c: Add copyright notice to files missing them.
* commit '
ec5c3b9040625e53e3f5cff1fe3d963b936065f0':
Add copyright notice to files missing them.
Narayan Kamath [Fri, 21 Feb 2014 16:58:33 +0000 (16:58 +0000)]
am
a1aeac80: am
25c55ca9: am
911b2ce3: am
4a642ee5: Merge "Remove unused JNITest class"
* commit '
a1aeac80df09cf8d481474264b1ce78ed64e7464':
Remove unused JNITest class
Narayan Kamath [Fri, 21 Feb 2014 16:58:28 +0000 (16:58 +0000)]
am
61910447: am
7942397b: am
19256340: am
22c66639: Merge "Fixes for 64bit in libhwui"
* commit '
6191044729b2dace9c9b4b15b19a8839377d8973':
Fixes for 64bit in libhwui
Craig Mautner [Fri, 21 Feb 2014 16:55:55 +0000 (16:55 +0000)]
am
c2c0a61c: Add copyright notice to files missing them.
* commit '
c2c0a61cf5f779b4726f089f28d966c03ccbba54':
Add copyright notice to files missing them.
Narayan Kamath [Fri, 21 Feb 2014 16:53:43 +0000 (16:53 +0000)]
am
25c55ca9: am
911b2ce3: am
4a642ee5: Merge "Remove unused JNITest class"
* commit '
25c55ca902f570d3a89753c6eb9492c20dd734ba':
Remove unused JNITest class
Narayan Kamath [Fri, 21 Feb 2014 16:53:40 +0000 (16:53 +0000)]
am
7942397b: am
19256340: am
22c66639: Merge "Fixes for 64bit in libhwui"
* commit '
7942397b3174a9642996979ae8b4aafb313dc2e2':
Fixes for 64bit in libhwui
Narayan Kamath [Fri, 21 Feb 2014 16:47:43 +0000 (16:47 +0000)]
am
911b2ce3: am
4a642ee5: Merge "Remove unused JNITest class"
* commit '
911b2ce3da7dbd8b6335d1092fc6c9e880147104':
Remove unused JNITest class
Narayan Kamath [Fri, 21 Feb 2014 16:47:38 +0000 (16:47 +0000)]
am
19256340: am
22c66639: Merge "Fixes for 64bit in libhwui"
* commit '
192563407964926537d688d4098054c3834341c0':
Fixes for 64bit in libhwui
Narayan Kamath [Fri, 21 Feb 2014 16:34:36 +0000 (08:34 -0800)]
am
4a642ee5: Merge "Remove unused JNITest class"
* commit '
4a642ee5e65ca47ecf6cb274096162e580aac922':
Remove unused JNITest class
Narayan Kamath [Fri, 21 Feb 2014 16:34:30 +0000 (08:34 -0800)]
am
22c66639: Merge "Fixes for 64bit in libhwui"
* commit '
22c66639093a634b5688372d261d003b0478c450':
Fixes for 64bit in libhwui
Narayan Kamath [Fri, 21 Feb 2014 15:02:30 +0000 (15:02 +0000)]
Merge "Remove unused JNITest class"
Ashok Bhat [Sat, 15 Feb 2014 11:28:48 +0000 (11:28 +0000)]
Remove unused JNITest class
JNITest class is no longer actively used. This patch
removes the class (java and jni) files.
JNI interfaces and calls are extensively tested in
the art unit tests (art/tests) and in cts (see
CtsJniTestCases).
Change-Id: I62f7c72deb5d206fa3f545ae39a9cb9011110d0a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Narayan Kamath [Fri, 21 Feb 2014 14:23:57 +0000 (14:23 +0000)]
Merge "Fixes for 64bit in libhwui"
Narayan Kamath [Fri, 21 Feb 2014 14:15:44 +0000 (14:15 +0000)]
Merge "AArch64: Make AssetAtlasService 64-bit compatible"
Derek Sollenberger [Fri, 21 Feb 2014 13:15:32 +0000 (13:15 +0000)]
Merge "Reapply "Refactor setting an SkPaint onto a hwui Layer.""
Kévin PETIT [Thu, 13 Feb 2014 11:03:40 +0000 (11:03 +0000)]
Fixes for 64bit in libhwui
Using reinterpret_cast allows conversions between pointer types
and integers which don't have the same size. The corresponding
flags is -Wint-to-pointer-cast.
Change-Id: I8ff0c79d235fa6d07b8d9305edc185d946d5133d
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Ashok Bhat [Mon, 27 Jan 2014 16:00:23 +0000 (16:00 +0000)]
AArch64: Make AssetAtlasService 64-bit compatible
Changes in this patch include
[x] Long(64-bit) is used to store native pointers in
AssetAtlasService and related classes as they can be 64-bit.
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
(cherry-picked from
4de3f481bc59ab4b766dc027e41aff7cda9d62f7)
Change-Id: If22daf40eef46f8df9f94d65ddcc52c45b3acf2a
Narayan Kamath [Fri, 21 Feb 2014 12:36:19 +0000 (12:36 +0000)]
Merge "Make LruCache.resize(int) public"
Craig Mautner [Fri, 21 Feb 2014 04:25:41 +0000 (20:25 -0800)]
Add copyright notice to files missing them.
Fixes bug
13121968.
Change-Id: Ifd86581178e7e98bd72b832020e7c8379d40b2de
Craig Mautner [Fri, 21 Feb 2014 04:20:58 +0000 (04:20 +0000)]
am
6222a8ef: am
1648f042: am
fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
* commit '
6222a8ef853609ea9c0f725c2412a2d25968d9da':
Set the new SurfaceControl opaque flag.
Craig Mautner [Fri, 21 Feb 2014 04:20:39 +0000 (04:20 +0000)]
am
56dbf7b0: am
3519530f: am
267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
* commit '
56dbf7b092826b1cef42357bda422baf18d2292c':
Resize DimLayer explicitly on rotation.
Michael Wright [Fri, 21 Feb 2014 02:09:48 +0000 (02:09 +0000)]
Merge "Unbreak manual brightness setting."
Jeff Brown [Fri, 21 Feb 2014 02:07:45 +0000 (02:07 +0000)]
Merge "resolved conflicts for merge of
baaa080b to master"
Jeff Brown [Fri, 21 Feb 2014 02:05:03 +0000 (18:05 -0800)]
resolved conflicts for merge of
baaa080b to master
Change-Id: I3ee12321e298f7a2ea577a99f30c49f3bb497fae
Michael Wright [Wed, 19 Feb 2014 06:50:50 +0000 (22:50 -0800)]
Unbreak manual brightness setting.
Change-Id: I0ba5b82f60eacd66db0dcf4166e9a919ee06f2e0
Ben Gruver [Fri, 21 Feb 2014 01:18:58 +0000 (01:18 +0000)]
Merge "Add ability to match intents based on the package name of the intent sender"
Matt Casey [Fri, 21 Feb 2014 01:18:24 +0000 (01:18 +0000)]
Merge "Add more MediaStore constants for playback intents"
Matt Casey [Wed, 5 Feb 2014 23:51:39 +0000 (15:51 -0800)]
Add more MediaStore constants for playback intents
Constants are derived from this doc:
https://docs.google.com/a/google.com/document/d/1lmlFcTeefLDRp_bpMrXk3yK9nKxoTVfpcShanpLxiMg/edit#heading=h.b16863tyyjzv
That doc contains the full explanation of these changes.
I'm making this change on behalf of {elmas,pengr} who don't have
android source access but designed this in collaboration with
rharagutchi on the play music team. I'll probably have to route any
significant questions through them.
Bug:
12874557
Change-Id: I85a4bee57a2bde519da0dc6de2cad9d036da225c
Alan Viverette [Fri, 21 Feb 2014 00:10:38 +0000 (16:10 -0800)]
Invalidate projection receiver, refactor invalidate methods
Change-Id: I61bd705abeadbdc6ef611d1c7368cecfd908076f
Amith Yamasani [Fri, 21 Feb 2014 00:06:03 +0000 (00:06 +0000)]
Merge "Abort removing account if prohibited by policy"
Amith Yamasani [Thu, 20 Feb 2014 23:23:36 +0000 (15:23 -0800)]
Abort removing account if prohibited by policy
Bug:
13077993
If an EDU device was marked as prohibited from adding/removing accounts, it was throwing
an error but still continuing to remove the account. This fixes the problem by aborting
the removeAccount steps.
Change-Id: Ie7f157c5397a7391aab6f37c8a4331479f1b451b
Baligh Uddin [Thu, 20 Feb 2014 23:02:09 +0000 (23:02 +0000)]
am
17b7705a: (-s ours) am
fbb100c4: (-s ours) am
ea17c636: (-s ours) am
4292ce5d: (-s ours) am
810267c3: (-s ours) am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
17b7705afb3e36a6239fdcc3fadfa6601f32fe98':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 23:02:06 +0000 (23:02 +0000)]
am
c87c6a2a: (-s ours) am
a69996e4: (-s ours) am
701449e8: (-s ours) am
c9443fc5: (-s ours) am
8ca432c7: (-s ours) am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c87c6a2a4630e53d8dc07eb53095776fa31c463f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 23:01:47 +0000 (23:01 +0000)]
am
46f1744a: (-s ours) am
2f07a705: (-s ours) am
50d0afa4: (-s ours) am
2f5347ee: (-s ours) am
1af20cc5: (-s ours) am
554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
46f1744acf7bd795ac80ed10a5b6bd3f03682b46':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 23:01:43 +0000 (23:01 +0000)]
am
e16fe1aa: (-s ours) am
13e85016: (-s ours) am
749e6b9c: (-s ours) am
5da96060: (-s ours) am
f887a67d: (-s ours) am
aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 23:01:39 +0000 (23:01 +0000)]
am
e9a5424c: (-s ours) am
a935d31c: (-s ours) am
bf2226ec: (-s ours) am
8b297fb6: (-s ours) am
8027100f: (-s ours) am
e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e9a5424cc64e44812383ab9e417f18b8a1f647d1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 23:01:37 +0000 (23:01 +0000)]
am
54de3ec2: (-s ours) am
72edb1b7: (-s ours) am
699991c8: (-s ours) am
08394af2: (-s ours) am
e69b7b34: (-s ours) am
46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
54de3ec25b309f51f4a05438fd0089d713cd5309':
Import translations. DO NOT MERGE
Xavier Ducrohet [Thu, 20 Feb 2014 23:01:33 +0000 (23:01 +0000)]
am
7d236199: (-s ours) am
21c5c8e6: am
9edf7a11: am
2cb9147f: am
55542ee6: am
3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '
7d23619918eab43e6a54d9f780a0610e6e237ec3':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 23:01:30 +0000 (23:01 +0000)]
am
7b5d0a82: (-s ours) am
c139177b: am
65521c3c: am
ca4b9a77: am
e92c8542: am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
7b5d0a82f65ff83d0c360f47d7506ee22a7b7941':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Justin Koh [Thu, 20 Feb 2014 23:01:25 +0000 (23:01 +0000)]
am
7206ac56: am
a79ac472: am
744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev
* commit '
7206ac561291298f08809614be95963966a72ca8':
Add hardware feature describing a watch.
Craig Mautner [Thu, 20 Feb 2014 22:42:59 +0000 (22:42 +0000)]
am
1648f042: am
fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
* commit '
1648f042f31df54c25a725c4c5ca2c852a10ef0e':
Set the new SurfaceControl opaque flag.
Craig Mautner [Thu, 20 Feb 2014 22:42:56 +0000 (22:42 +0000)]
am
3519530f: am
267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
* commit '
3519530fae3584c74db294ab11814f94b966d419':
Resize DimLayer explicitly on rotation.
Craig Mautner [Thu, 20 Feb 2014 22:39:52 +0000 (22:39 +0000)]
am
fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
* commit '
fd8a8ccbb79b3d83bb328d64c544c59251eef151':
Set the new SurfaceControl opaque flag.
Craig Mautner [Thu, 20 Feb 2014 22:39:49 +0000 (22:39 +0000)]
am
267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
* commit '
267b37ceff64b6adaeef52e3a582f1186144f93e':
Resize DimLayer explicitly on rotation.
Craig Mautner [Thu, 20 Feb 2014 22:36:52 +0000 (22:36 +0000)]
Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
Craig Mautner [Thu, 20 Feb 2014 22:34:38 +0000 (22:34 +0000)]
Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
Craig Mautner [Thu, 20 Feb 2014 22:31:32 +0000 (14:31 -0800)]
Resize DimLayer explicitly on rotation.
Using the alpha value to trigger a resizing of the DimLayer was a
Bad Idea. The alpha value should reflect the true alpha value and
not be used to trick the code. Actually changing the size and
position is a Better Idea.
Fixes bug
13101776.
Change-Id: I11c16b8276919ea85960fe87bb17c0956ce8a3b1
Alan Viverette [Thu, 20 Feb 2014 22:03:55 +0000 (22:03 +0000)]
Merge "Fix density in touch feedback drawable"
Alan Viverette [Thu, 20 Feb 2014 22:03:27 +0000 (14:03 -0800)]
Fix density in touch feedback drawable
Change-Id: I90b08aea9f5ba0a29ae5328960bacebc6c2099d8
Narayan Kamath [Thu, 20 Feb 2014 21:58:04 +0000 (21:58 +0000)]
am
66e30b35: am
c95ed621: am
fca204a4: am
05cebdc2: Merge "Fix several bad function definitions."
* commit '
66e30b357dd105246430d552f4cf4a7cff665abb':
Fix several bad function definitions.
Narayan Kamath [Thu, 20 Feb 2014 21:58:02 +0000 (21:58 +0000)]
am
fb7b3181: (-s ours) am
520a5673: am
b152473f: am
9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"
* commit '
fb7b3181fc291b17f4376d1163edd32c4fb8cca7':
AArch64: Make AssetAtlasService 64-bit compatible
Jeff Brown [Thu, 20 Feb 2014 21:49:15 +0000 (21:49 +0000)]
am
90506a41: am
07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev
* commit '
90506a41c6b85cf7e65b663480e4fe003a99c8c2':
Add a new "doze mode" based on Dream components.
Jeff Brown [Thu, 20 Feb 2014 21:47:08 +0000 (21:47 +0000)]
am
07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev
* commit '
07e6d1b9a5f81ff5a5bf91f2b260ee487d5f2b65':
Add a new "doze mode" based on Dream components.
Jeff Brown [Thu, 20 Feb 2014 21:43:42 +0000 (21:43 +0000)]
Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev
Jeff Brown [Fri, 31 Jan 2014 05:47:47 +0000 (21:47 -0800)]
Add a new "doze mode" based on Dream components.
When a doze component has been specified in a config.xml resource
overlay, the power manager will try to start a preconfigured dream
whenever it would have otherwise gone to sleep and turned the
screen off. The dream should render whatever it intends to show
then call startDozing() to tell the power manager to put the display
into a low power "doze" state and allow the application processor
to be suspended. The dream may wake up periodically using the
alarm manager or other features to update the contents of the display.
Added several new config.xml resources related to dreams and dozing.
In particular for dozing there are two new resources that pertain to
decoupling auto-suspend mode and interactive mode from the display
state. This is a requirement to enable the application processor
and other components to be suspended while dozing. Most devices
do not support these features today.
Consolidated the power manager's NAPPING and DREAMING states into one
to simplify the logic. The NAPPING state was mostly superfluous
and simply indicated that the power manager should attempt to start
a new dream. This state is now tracked in the mSandmanSummoned field.
Added a new DOZING state which is analoguous to DREAMING. The normal
state transition is now: AWAKE -> DREAMING -> DOZING -> ASLEEP.
The PowerManager.goToSleep() method now enters the DOZING state instead
of immediately going to sleep.
While in the doze state, the screen remains on. However, we actually
tell the rest of the system that the screen is off. This is somewhat
unfortunate but much of the system makes inappropriate assumptions
about what it means for the screen to be on or off. In particular,
screen on is usually taken to indicate an interactive state where
the user is present but that's not at all true for dozing (and is
only sometimes true while dreaming). We will probably need to add
some more precise externally visible states at some point.
The DozeHardware interface encapsulates a generic microcontroller
interface to allow a doze dream for off-loading rendering or other
functions while dozing. If the device possesses an MCU HAL for dozing
then it is exposed to the DreamService here.
Removed a number of catch blocks in DreamService that caught Throwable
and attempted to cause the dream to finish itself. We actually just
want to let the process crash. Cleanup will happen automatically if
needed. Catching these exceptions results in mysterious undefined
behavior and broken dreams.
Bug:
12494706
Change-Id: Ie78336b37dde7250d1ce65b3d367879e3bfb2b8b
Narayan Kamath [Thu, 20 Feb 2014 21:28:09 +0000 (21:28 +0000)]
am
bcb433b4: am
b1903653: am
128599e4: am
2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"
* commit '
bcb433b43acb424ff7bc6afab03ce12d8cc9a198':
libandroidfw: fix build error for 64-bit
Scott Main [Thu, 20 Feb 2014 21:27:47 +0000 (21:27 +0000)]
am
5ef8d14d: am
72eff55b: am
d43ad2f3: am
4c68c4ed: am
24a8e1d0: am
af87e19b: Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
* commit '
5ef8d14d38654e6309babf46f64f5a296df5c169':
update intent examples for maps bug:
12661490 bug:
12957723
John Reck [Thu, 20 Feb 2014 21:24:29 +0000 (21:24 +0000)]
Merge "Fix NPE in layer destruction"
Derek Sollenberger [Wed, 19 Feb 2014 16:47:32 +0000 (16:47 +0000)]
Reapply "Refactor setting an SkPaint onto a hwui Layer."
This reverts commit
90d0c75e94a32fb7d993fae69762820aabc2fcbb.
Change-Id: Ie807761231edf7c848b019931dccbf466208c0be
John Reck [Thu, 20 Feb 2014 21:18:42 +0000 (13:18 -0800)]
Fix NPE in layer destruction
Bug:
13111945
Fixes an issue where a layer is destroyed after the GLRenderer
lost its Surface. Instead just check that the context we want is
current regardless of the active surface
Change-Id: I6537e6232b5c667b218b896ed5ef390fbe956344
Derek Sollenberger [Thu, 20 Feb 2014 21:14:49 +0000 (21:14 +0000)]
Merge "Update framework to enable Skia to run in debug mode."
Michael Wright [Thu, 20 Feb 2014 21:07:56 +0000 (21:07 +0000)]
Merge "Make deliverInputEvent tracing asynchronous"
Derek Sollenberger [Thu, 20 Feb 2014 15:25:19 +0000 (10:25 -0500)]
Update framework to enable Skia to run in debug mode.
Change-Id: I8ba605cfae61b584dad27e3245c4482c8dfdff2e
Baligh Uddin [Thu, 20 Feb 2014 18:47:45 +0000 (18:47 +0000)]
am
fbb100c4: (-s ours) am
ea17c636: (-s ours) am
4292ce5d: (-s ours) am
810267c3: (-s ours) am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
fbb100c437d52db818e6e57c18ffe1e969ba46b0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:47:43 +0000 (18:47 +0000)]
am
a69996e4: (-s ours) am
701449e8: (-s ours) am
c9443fc5: (-s ours) am
8ca432c7: (-s ours) am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a69996e45c7c40d971b05a56866b7ac5c7f617de':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:43:00 +0000 (18:43 +0000)]
am
ea17c636: (-s ours) am
4292ce5d: (-s ours) am
810267c3: (-s ours) am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ea17c6365fd70b057a4c696d9eec2b5f70b6e476':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:42:58 +0000 (18:42 +0000)]
am
701449e8: (-s ours) am
c9443fc5: (-s ours) am
8ca432c7: (-s ours) am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
701449e85395d7a81d244d4b115b9ef4ae2f06d9':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:39:46 +0000 (18:39 +0000)]
am
4292ce5d: (-s ours) am
810267c3: (-s ours) am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4292ce5d0023551a6fa7a02b284bf9b02823b06b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:39:43 +0000 (18:39 +0000)]
am
c9443fc5: (-s ours) am
8ca432c7: (-s ours) am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c9443fc54caa789c4e3c64e7d9feaee8ac00506f':
Import translations. DO NOT MERGE
Deepanshu Gupta [Thu, 20 Feb 2014 18:37:50 +0000 (18:37 +0000)]
Merge "Add ability to obtain themed Drawable from Context"
Baligh Uddin [Thu, 20 Feb 2014 18:36:38 +0000 (18:36 +0000)]
am
810267c3: (-s ours) am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
810267c309f018c5b58b0a2e787b8a6434faa0e0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:36:35 +0000 (18:36 +0000)]
am
8ca432c7: (-s ours) am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8ca432c7828d5d3d00c721b195a4ecb59564bbb7':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:33:18 +0000 (18:33 +0000)]
am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
28009e8102aa91294362cc2d7770cab73d02e640':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:33:13 +0000 (18:33 +0000)]
am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c2803d473ad180fa70e5000f0607795c92c4035d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:31:02 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 18:30:49 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 18:17:41 +0000 (18:17 +0000)]
am
2f07a705: (-s ours) am
50d0afa4: (-s ours) am
2f5347ee: (-s ours) am
1af20cc5: (-s ours) am
554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2f07a7059f4471963c114b0ab944249e8746cbf9':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:13:52 +0000 (18:13 +0000)]
am
50d0afa4: (-s ours) am
2f5347ee: (-s ours) am
1af20cc5: (-s ours) am
554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
50d0afa43af2b215ddddbc7a3adfb8b5d85cb549':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:13:43 +0000 (18:13 +0000)]
am
13e85016: (-s ours) am
749e6b9c: (-s ours) am
5da96060: (-s ours) am
f887a67d: (-s ours) am
aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
13e850160d21008597239dc974c805df057d4e1b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:13:40 +0000 (18:13 +0000)]
am
a935d31c: (-s ours) am
bf2226ec: (-s ours) am
8b297fb6: (-s ours) am
8027100f: (-s ours) am
e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a935d31ca87146990010121b576506faef803404':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:13:38 +0000 (18:13 +0000)]
am
72edb1b7: (-s ours) am
699991c8: (-s ours) am
08394af2: (-s ours) am
e69b7b34: (-s ours) am
46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
72edb1b78d0316055b40931138ee75a99766995d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:10:15 +0000 (18:10 +0000)]
am
2f5347ee: (-s ours) am
1af20cc5: (-s ours) am
554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2f5347ee46766134848586d67d2dd86bdc9d1952':
Import translations. DO NOT MERGE
OSDN Git Service
