OSDN Git Service
Yao Chen [Thu, 24 Jul 2014 21:48:04 +0000 (21:48 +0000)]
am
5599c63b: Use a sequence number for thumbnail callback.
* commit '
5599c63b69b07990d1a4a25bbad4cf0eed31c146':
Use a sequence number for thumbnail callback.
Yao Chen [Wed, 23 Jul 2014 22:04:48 +0000 (15:04 -0700)]
Use a sequence number for thumbnail callback.
Change-Id: I27888cd0437b4f654cb29371b7d86b9341d84ae9
John Reck [Thu, 24 Jul 2014 21:32:49 +0000 (21:32 +0000)]
am
c8f0e9b1: Fix ALL compile warnings
* commit '
c8f0e9b1319e6db54074905178a80eff5c95a220':
Fix ALL compile warnings
John Reck [Thu, 24 Jul 2014 20:38:28 +0000 (13:38 -0700)]
Fix ALL compile warnings
All warnings/errors fixed for GCC & Clang
Change-Id: I2ece3a136a5ae97a9acc3069537ed986238b5fd3
George Mount [Thu, 24 Jul 2014 21:21:46 +0000 (21:21 +0000)]
am
fc687570: Merge "Fix no transition when only shared element exists." into lmp-dev
* commit '
fc687570c437d938f7849fda314b4743e7315adc':
Fix no transition when only shared element exists.
Jean-Michel Trivi [Thu, 24 Jul 2014 21:15:20 +0000 (21:15 +0000)]
am
a71bb88d: Merge "Remove MediaFocusControl persisting media button receiver" into lmp-dev
* commit '
a71bb88da69813a9f8f77a852e80960cba35f87b':
Remove MediaFocusControl persisting media button receiver
Baligh Uddin [Thu, 24 Jul 2014 21:11:08 +0000 (21:11 +0000)]
am
ee7df0a3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ee7df0a31234c9490f7384edf66900d82eec2533':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Jul 2014 21:11:05 +0000 (21:11 +0000)]
am
a81e8b66: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
a81e8b66f03f746682c16365e4e86f3d75cc294d':
Import translations. DO NOT MERGE
Craig Mautner [Thu, 24 Jul 2014 20:51:59 +0000 (20:51 +0000)]
am
b803a2be: Refactor screen blocking logic.
* commit '
b803a2be0f54e7b4f1b5f606dbda4dbf86307f12':
Refactor screen blocking logic.
Alan Viverette [Thu, 24 Jul 2014 20:51:55 +0000 (20:51 +0000)]
am
37a2d88f: Merge "Remove the max ripple count exceeded warning" into lmp-dev
* commit '
37a2d88f2616282ab8c06c89c334e3e8af8adc6c':
Remove the max ripple count exceeded warning
Craig Mautner [Thu, 24 Jul 2014 04:47:09 +0000 (21:47 -0700)]
Refactor screen blocking logic.
Because of the call to turn on the screen introduced in ag/495255
is now made earlier we may not have sent the wakeup broadcast by
the time the windows have all drawn. In such a case onScreenOn()
did not release the wakelock and the screen stayed off.
This change ensures that no matter the timing of onScreenOn()
the wakelock will be released but only for the onScreenOn()
called in response to the most recent screen on transition.
Fixes bug
16404078.
Change-Id: Ic1e3e61e16c1fc34d4ec657e0e53ac49a05ca6a4
George Mount [Thu, 24 Jul 2014 21:19:18 +0000 (21:19 +0000)]
Merge "Fix no transition when only shared element exists." into lmp-dev
Baligh Uddin [Thu, 24 Jul 2014 21:04:57 +0000 (21:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Alan Viverette [Thu, 24 Jul 2014 20:45:40 +0000 (20:45 +0000)]
am
d2a2e3bb: Merge "Update icons for search and back" into lmp-dev
* commit '
d2a2e3bb818eb9009782dd7d399514e43fed7cba':
Update icons for search and back
Adam Lesinski [Thu, 24 Jul 2014 20:34:11 +0000 (20:34 +0000)]
am
94499248: Merge "Add <feature-group> tag and change aapt badging" into lmp-dev
* commit '
94499248f296e62dbb19ebae5a219a936afcfd53':
Add <feature-group> tag and change aapt badging
George Mount [Thu, 24 Jul 2014 20:19:51 +0000 (13:19 -0700)]
Fix no transition when only shared element exists.
Bug
16245703
Change-Id: Ie31baaf7f58038fc79ffca0206ce3bec0ef64cb4
Prerepa Viswanadham [Thu, 24 Jul 2014 19:32:41 +0000 (19:32 +0000)]
am
6565c129: cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
* commit '
6565c12905b959401c2f9d3cb123e200bb7ce0e2':
cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
Svetoslav [Thu, 24 Jul 2014 19:28:43 +0000 (19:28 +0000)]
am
fc7c8bee: Updated accessibility nodes not properly cached.
* commit '
fc7c8beecb31cc94d23e0d4312e93c2e38989c2b':
Updated accessibility nodes not properly cached.
Prerepa Viswanadham [Thu, 24 Jul 2014 19:22:24 +0000 (12:22 -0700)]
cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
Change-Id: Ia58a46392157e274f8fc4696e8e25af480eb2d2a
Svetoslav [Thu, 24 Jul 2014 19:19:22 +0000 (12:19 -0700)]
Updated accessibility nodes not properly cached.
We have an accessibiliy node info cache in the process of each
accessibility service. Sometimes the cached node changes and
in this case we have evict from the cache the sub-trees rooted
at children that are no longer present. There was bug where if
none of the children is present anymore we did not evict their
sub-trees.
Also the verification logic was not stopping if a duplicate
node is seen potentially getting into an infinite loop.
bug:
15729762
Change-Id: I7adf4f0a1bde07b385556d9acdded5059231f1f3
John Spurlock [Thu, 24 Jul 2014 19:23:35 +0000 (19:23 +0000)]
am
54a6d07c: Merge "Volume: force-dismiss panel when the screen turns off." into lmp-dev
* commit '
54a6d07c818c34f7361a45e1a79e5cfe2d876edd':
Volume: force-dismiss panel when the screen turns off.
John Spurlock [Thu, 24 Jul 2014 19:02:04 +0000 (19:02 +0000)]
am
79c0bf24: Merge "QS: Fix clipped battery icon when expanded." into lmp-dev
* commit '
79c0bf24e8a5af9a41b4d8f2103623fdadf0d86e':
QS: Fix clipped battery icon when expanded.
Wei Wang [Thu, 24 Jul 2014 18:31:27 +0000 (18:31 +0000)]
am
c20ddd45: Merge "Move AdvertiseData length check to BluetoothAdvertiser." into lmp-dev
* commit '
c20ddd4563d4a7fc675d6f1f5060373fac78b1af':
Move AdvertiseData length check to BluetoothAdvertiser.
Hector Dearman [Thu, 24 Jul 2014 18:10:11 +0000 (18:10 +0000)]
am
aa2a5911: Merge "Update CookieManager API for Council review." into lmp-dev
* commit '
aa2a591149af6c904adb780ac539194a0b9893a0':
Update CookieManager API for Council review.
Chris Craik [Thu, 24 Jul 2014 18:10:07 +0000 (18:10 +0000)]
am
1a146fc8: Compute layer bounds over subset of VertexBuffer verts
* commit '
1a146fc8f4f02869ff24c15c63e98d62b2a07811':
Compute layer bounds over subset of VertexBuffer verts
Ruben Brunk [Thu, 24 Jul 2014 18:10:02 +0000 (18:10 +0000)]
am
70279653: camera2: Move noise model to dynamic metadata.
* commit '
70279653dbdfd7c95c55d54ba1bbb2d873f8e099':
camera2: Move noise model to dynamic metadata.
Yorke Lee [Thu, 24 Jul 2014 18:09:58 +0000 (18:09 +0000)]
am
9abe5673: Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev
* commit '
9abe5673818acbcf6b2313a2ebbf64c062eb41b2':
Add Calls.TRANSCRIPTION to CallLog (2/2)
Chris Craik [Thu, 24 Jul 2014 00:21:25 +0000 (17:21 -0700)]
Compute layer bounds over subset of VertexBuffer verts
bug:
15538815
Change-Id: I0dbb54f656a6ae99a87c5734761107e1c2351b65
Ruben Brunk [Thu, 24 Jul 2014 00:49:08 +0000 (17:49 -0700)]
camera2: Move noise model to dynamic metadata.
Bug:
16369384
Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
ram [Thu, 24 Jul 2014 17:39:40 +0000 (17:39 +0000)]
am
487c4b7f: IMS: Adding ims on/off interface files and callback for enabled/disabled features.
* commit '
487c4b7f7a9caf275e89a8dd9f337b5db7296939':
IMS: Adding ims on/off interface files and callback for enabled/disabled features.
ram [Wed, 16 Jul 2014 16:08:42 +0000 (21:38 +0530)]
IMS: Adding ims on/off interface files and callback for enabled/disabled features.
Change-Id: I4e0049d605d9e7d13035c43e2504cdfb67a7a102
Amit Mahajan [Thu, 24 Jul 2014 17:35:26 +0000 (17:35 +0000)]
am
8d569bbf: Merge "Add API invokeOemRilRequestRaw" into lmp-dev
* commit '
8d569bbf62a3bfb177afdc6a736834c077b5cbb8':
Add API invokeOemRilRequestRaw
Svetoslav [Thu, 24 Jul 2014 17:21:40 +0000 (17:21 +0000)]
am
a6960246: Print to PDF putting a pring job in a wrong state.
* commit '
a6960246b2053d29ee61080903762c5d75131573':
Print to PDF putting a pring job in a wrong state.
Svetoslav [Thu, 24 Jul 2014 17:13:00 +0000 (10:13 -0700)]
Print to PDF putting a pring job in a wrong state.
When printing to a PDF file we get a Uri from the storage APIs
and write the content. Once the file is written to storage the
print job is completed and there is print service involved. Th
spooler was wrongly putting the job in a failed state instead
of a complete state.
bug:
16522267
Change-Id: I4741c9b9eb763e118e7dfb2c7c502bd7fc13f7a1
Leon Scroggins III [Thu, 24 Jul 2014 17:07:21 +0000 (17:07 +0000)]
am
41508fb0: Merge "Document BlurMaskFilter.Blur." into lmp-dev
* commit '
41508fb01d8a9fd031e666f80bf74758b4bd28ad':
Document BlurMaskFilter.Blur.
Chris Craik [Thu, 24 Jul 2014 16:48:19 +0000 (16:48 +0000)]
am
2d3c6c93: Connect shadow style attributes to renderer
* commit '
2d3c6c9382dcb1033737fa177aa7dc592afed46c':
Connect shadow style attributes to renderer
Chris Craik [Thu, 24 Jul 2014 01:19:28 +0000 (18:19 -0700)]
Connect shadow style attributes to renderer
bug:
15859361
Moves lighting info out of StatefulBaseRenderer, since it's not useful
at record time, and only used by OGLR.
Change-Id: I7ab065d02d9304afad1dc4c48597a7a621366f8e
Ricardo Cervera [Thu, 24 Jul 2014 16:28:30 +0000 (16:28 +0000)]
am
e974a59f: am
0f1e067a: am
472e234d: am
7af4e812: docs: Fixed RecyclerView example. Bug:
16483811
* commit '
e974a59f7c5c5d1ade49b846b1f515b40230c6c8':
docs: Fixed RecyclerView example. Bug:
16483811
Robert Ly [Thu, 24 Jul 2014 16:28:26 +0000 (16:28 +0000)]
am
1be71de6: am
39572996: am
1903bbb8: am
22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
* commit '
1be71de6a71a871da7980d84dad4e3d12ed5cefc':
cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
Scott Rowe [Thu, 24 Jul 2014 16:28:23 +0000 (16:28 +0000)]
am
1b009123: am
162493b5: am
3bb44fec: am
72c80d30: cherrypick from klp-docs docs: b/
14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
* commit '
1b009123999c485b7b7294f44faac821af013803':
cherrypick from klp-docs docs: b/
14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
Ricardo Cervera [Thu, 24 Jul 2014 16:22:40 +0000 (16:22 +0000)]
am
0f1e067a: am
472e234d: am
7af4e812: docs: Fixed RecyclerView example. Bug:
16483811
* commit '
0f1e067a28c2ef50d4db53ad19e0902b052bd014':
docs: Fixed RecyclerView example. Bug:
16483811
Robert Ly [Thu, 24 Jul 2014 16:22:29 +0000 (16:22 +0000)]
am
39572996: am
1903bbb8: am
22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
* commit '
39572996f25d4b4ce744d9d04080e33b687ab03b':
cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
Scott Rowe [Thu, 24 Jul 2014 16:22:15 +0000 (16:22 +0000)]
am
162493b5: am
3bb44fec: am
72c80d30: cherrypick from klp-docs docs: b/
14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
* commit '
162493b5e3fb1bbf4505c2d18ebf6c900d7875e6':
cherrypick from klp-docs docs: b/
14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
Justin Morey [Thu, 24 Jul 2014 15:59:00 +0000 (15:59 +0000)]
am
75a72009: Merge "Fix build" into lmp-dev
* commit '
75a720091bf1d08a61ff92616b64170a4f65c5c6':
Fix build
Kenny Guy [Thu, 24 Jul 2014 15:54:55 +0000 (15:54 +0000)]
am
b4900242: Load package information from correct user.
* commit '
b490024232143ebde9bc14f33c775cbcfaba03af':
Load package information from correct user.
Kenny Guy [Tue, 15 Jul 2014 11:41:24 +0000 (12:41 +0100)]
Load package information from correct user.
Handle case where a package is only installed
for secondary user.
Bug:
15983201
Change-Id: I6733011c59e6d08d275dc761660d38b709051d79
Adrian Roos [Thu, 24 Jul 2014 15:37:25 +0000 (15:37 +0000)]
am
29c97b8d: Update KeyguardUserSwitcher to use UserSwitcherController
* commit '
29c97b8d23cd1b8174e19c13484f9f355d6356d8':
Update KeyguardUserSwitcher to use UserSwitcherController
Justin Morey [Thu, 24 Jul 2014 15:55:35 +0000 (15:55 +0000)]
Merge "Fix build" into lmp-dev
Justin Morey [Thu, 24 Jul 2014 15:53:40 +0000 (10:53 -0500)]
Fix build
Change-Id: I8790b274864610b7e00d7ea12efe96b3b826301f
John Spurlock [Thu, 24 Jul 2014 19:16:35 +0000 (19:16 +0000)]
Merge "Volume: force-dismiss panel when the screen turns off." into lmp-dev
John Spurlock [Thu, 24 Jul 2014 19:15:25 +0000 (15:15 -0400)]
Volume: force-dismiss panel when the screen turns off.
Bug:
16492823
Change-Id: Ifc069ef936dc5f29d11f6b11dcc7131f440c7f0b
John Spurlock [Thu, 24 Jul 2014 18:56:27 +0000 (18:56 +0000)]
Merge "QS: Fix clipped battery icon when expanded." into lmp-dev
John Spurlock [Thu, 24 Jul 2014 16:16:14 +0000 (12:16 -0400)]
QS: Fix clipped battery icon when expanded.
Change-Id: If5ad46b9f25e70af0e13654ce1137955eb87eec2
Jean-Michel Trivi [Thu, 24 Jul 2014 21:12:19 +0000 (21:12 +0000)]
Merge "Remove MediaFocusControl persisting media button receiver" into lmp-dev
Jean-Michel Trivi [Thu, 24 Jul 2014 17:06:13 +0000 (10:06 -0700)]
Remove MediaFocusControl persisting media button receiver
MediaFocusControl doesn't handle media button receivers anymore,
so it should read and persist a receiver, and monitor
package addition/removals.
Also involved a security vulnerability, see bug
Bug
15428797
Change-Id: Ia2be01b20dc4a9820cc0cd3d0605ac03770b266b
Alan Viverette [Thu, 24 Jul 2014 20:47:37 +0000 (20:47 +0000)]
Merge "Remove the max ripple count exceeded warning" into lmp-dev
Alan Viverette [Thu, 24 Jul 2014 20:45:46 +0000 (13:45 -0700)]
Remove the max ripple count exceeded warning
BUG:
16543509
Change-Id: I84ec8e01136d1f0f34c6153d8ef7936de547746e
Alan Viverette [Thu, 24 Jul 2014 20:42:40 +0000 (13:42 -0700)]
Update icons for search and back
BUG:
16539661
Change-Id: If914e812841d2844a4fa50cc5a863615531371a2
Adam Lesinski [Thu, 24 Jul 2014 20:29:43 +0000 (20:29 +0000)]
Merge "Add <feature-group> tag and change aapt badging" into lmp-dev
Wei Wang [Thu, 24 Jul 2014 18:25:24 +0000 (18:25 +0000)]
Merge "Move AdvertiseData length check to BluetoothAdvertiser." into lmp-dev
Yorke Lee [Thu, 24 Jul 2014 17:40:11 +0000 (17:40 +0000)]
Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev
Hector Dearman [Thu, 24 Jul 2014 17:53:05 +0000 (17:53 +0000)]
Merge "Update CookieManager API for Council review." into lmp-dev
Hector Dearman [Mon, 21 Jul 2014 11:00:10 +0000 (12:00 +0100)]
Update CookieManager API for Council review.
Remove synchronized from setAcceptThirdPartyCookies
Bug:
16403458
Change-Id: I6073da2c03fd0952bc447f7cfe0d959148af6877
Leon Scroggins III [Thu, 24 Jul 2014 17:04:28 +0000 (17:04 +0000)]
Merge "Document BlurMaskFilter.Blur." into lmp-dev
Baligh Uddin [Thu, 24 Jul 2014 21:04:53 +0000 (21:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Alan Viverette [Thu, 24 Jul 2014 20:43:06 +0000 (20:43 +0000)]
Merge "Update icons for search and back" into lmp-dev
Amit Mahajan [Thu, 24 Jul 2014 17:32:37 +0000 (17:32 +0000)]
Merge "Add API invokeOemRilRequestRaw" into lmp-dev
Steven Liu [Thu, 17 Jul 2014 15:57:01 +0000 (10:57 -0500)]
Add API invokeOemRilRequestRaw
this API is used by system app, app could communicate with RIL
with it.
Change-Id: I5397c1cf2b108d9dc3a9694b1f071dc60bb5b341
Conflicts:
telephony/java/com/android/internal/telephony/ITelephony.aidl
Adrian Roos [Wed, 23 Jul 2014 19:13:21 +0000 (21:13 +0200)]
Update KeyguardUserSwitcher to use UserSwitcherController
Also wires up the button to expand the keyguard user switcher.
Also respects the EDU simple switcher setting.
Bug:
16043126
Change-Id: I58871ec3323b2cafcacbc747fec5f20c56172969
Selim Cinek [Thu, 24 Jul 2014 15:31:05 +0000 (15:31 +0000)]
am
13476f4d: Implemented new camera affordance
* commit '
13476f4d7832a2075c99d14217a3f5f47d14bd65':
Implemented new camera affordance
Yorke Lee [Thu, 24 Jul 2014 02:43:39 +0000 (19:43 -0700)]
Add Calls.TRANSCRIPTION to CallLog (2/2)
Dialer needs access to the TRANSCRIPTION column via the CallLog to
show voicemail transcriptions inline.
Change-Id: Id1807923a07af9e9e34783e6be2e39485eee7795
Selim Cinek [Tue, 8 Jul 2014 16:01:07 +0000 (18:01 +0200)]
Implemented new camera affordance
Also fixed a bug in the touch logic where you could close the shade / hint
after going to the camera / phone.
Bug:
15126905
Change-Id: Iadfde56cb68f4048868eedec6bd3456f55823cd9
Justin Morey [Thu, 24 Jul 2014 15:26:46 +0000 (15:26 +0000)]
am
1d1c13f0: Expose setActiveProfileOwner() using @SystemApi
* commit '
1d1c13f04c57abd8074b2d41550a42f1a916b8e1':
Expose setActiveProfileOwner() using @SystemApi
Justin Morey [Thu, 24 Jul 2014 14:16:35 +0000 (09:16 -0500)]
Expose setActiveProfileOwner() using @SystemApi
Change-Id: I1607fa90e76da495ede48f01ad250baae60108af
(cherry picked from commit
85db24136eefb01341760208541563aba05ce82e)
Leon Scroggins III [Thu, 24 Jul 2014 14:41:27 +0000 (10:41 -0400)]
Document BlurMaskFilter.Blur.
BUG:
1894887
Change-Id: Ia5ed8d8d5e3fcebec6f903b2641d030e8b29513c
Adrian Roos [Thu, 24 Jul 2014 14:35:16 +0000 (14:35 +0000)]
am
0f53ad6f: Disable trust agents after wrong credential is entered
* commit '
0f53ad6f88ac2a4eefc4b5037876ced2412c2b16':
Disable trust agents after wrong credential is entered
Derek Sollenberger [Thu, 24 Jul 2014 14:35:12 +0000 (14:35 +0000)]
am
85c1806b: Refactor text drawing to move minikin interactions outside of the canvas interface.
* commit '
85c1806b5dbafdf74d52fa995dd6901c65f39a08':
Refactor text drawing to move minikin interactions outside of the canvas interface.
Adrian Roos [Wed, 23 Jul 2014 13:45:05 +0000 (15:45 +0200)]
Disable trust agents after wrong credential is entered
Bug:
16498202
Change-Id: I36f2e80aec8c04bcb6e6d9f1b0e2ebb8fc49998e
Derek Sollenberger [Mon, 21 Jul 2014 19:22:10 +0000 (15:22 -0400)]
Refactor text drawing to move minikin interactions outside of the canvas interface.
bug:
15672762
Change-Id: Iad63855424b4eeccef67a7341a9c2b0018c64c30
Leon Scroggins III [Thu, 24 Jul 2014 13:38:18 +0000 (13:38 +0000)]
am
3b88245f: Make updateLocalMatrix replace the current Matrix.
* commit '
3b88245f5eec3b71cd7ede2502d87a02f34f0868':
Make updateLocalMatrix replace the current Matrix.
Leon Scroggins III [Tue, 22 Jul 2014 21:25:22 +0000 (17:25 -0400)]
Make updateLocalMatrix replace the current Matrix.
Fixes a bug introduced in I3c3316377874e89fccc85afb864bc038b0ef3890.
CreateLocalMatrixShader combines the existing matrix with the new
matrix, which is not what we want. Keep track of the original
SkShader at all times, and always create the local matrix shader
with the original. Store the SkShader with a local matrix as
Shader.native_with_local_matrix.
Make Shader.native_instance private. Instead of allowing direct
access, add an init() method which sets it, and getNativeInstance(),
which returns either native_instance or native_with_local_matrix,
as appropriate.
Make Shader subclasses call init(), instead of setting native_instance
directly.
Pass native_with_local_matrix pointer to nativeSetLocalMatrix and
nativeDestructor, which unrefs it (if not null).
Since nativeSetLocalMatrix no longer replaces the original, do not
unref it.
Add a comment to Shader.updateLocalMatrix that it does not affect
ComposeShaders created with this Shader. (This should have been a
part of I3c3316377874e89fccc85afb864bc038b0ef3890.)
BUG:
16293121
Change-Id: Ieb31c7e1fe99081f6b81493178f4a18d3c5df643
Nicolas Prevot [Thu, 24 Jul 2014 12:11:55 +0000 (12:11 +0000)]
am
4fe8fe2b: Merge "Making the clipboard work across users." into lmp-dev
* commit '
4fe8fe2b7afbd16f02bbedae33f4ac8a7402da40':
Making the clipboard work across users.
Neil Fuller [Thu, 24 Jul 2014 12:11:51 +0000 (12:11 +0000)]
am
e678391e: Merge "Rewriting android.text.format.Time without the native _tz functions" into lmp-dev
* commit '
e678391e0c101427057a7fa6651ab42c0202290b':
Rewriting android.text.format.Time without the native _tz functions
Robin Lee [Thu, 24 Jul 2014 12:11:31 +0000 (12:11 +0000)]
am
93c947f9: Show disclosure when an intent switches profiles
* commit '
93c947f9143df0bebd924a387937c67cc87052c5':
Show disclosure when an intent switches profiles
Ji-Hwan Lee [Thu, 24 Jul 2014 12:11:27 +0000 (12:11 +0000)]
am
fe199929: Merge "TIF: Handle null main session" into lmp-dev
* commit '
fe199929d28aae569ec215b152e86f0d34214c43':
TIF: Handle null main session
Sungsoo Lim [Thu, 24 Jul 2014 12:11:24 +0000 (12:11 +0000)]
Ji-Hwan Lee [Thu, 24 Jul 2014 12:11:20 +0000 (12:11 +0000)]
am
f9203497: Merge "TIF: Fix crash on setMainSession" into lmp-dev
* commit '
f920349722a3453f22165f4e2693c2890e3b8aa0':
TIF: Fix crash on setMainSession
Sandeep Siddhartha [Thu, 24 Jul 2014 12:11:06 +0000 (12:11 +0000)]
am
e99f48c3: Merge "searchKeyphrase* should not be in the SDK" into lmp-dev
* commit '
e99f48c340fc91ccfa4f9ca9fca27755694b88c8':
searchKeyphrase* should not be in the SDK
Ji-Hwan Lee [Thu, 24 Jul 2014 12:11:00 +0000 (12:11 +0000)]
am
22185ce0: TIF: Support HDMI-CEC active source management
* commit '
22185ce066e7ad658b31affbc01ebac4b8bd5f80':
TIF: Support HDMI-CEC active source management
Terry Heo [Thu, 24 Jul 2014 12:10:56 +0000 (12:10 +0000)]
am
f71dcd8e: Merge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev
* commit '
f71dcd8e0e17dfe97d0d4063ec45cf025b9b1b13':
TIF: Enable capturing TV input of TvInputPassthroughWrapperService
Antoine Labour [Thu, 24 Jul 2014 12:10:38 +0000 (12:10 +0000)]
am
4a35f41a: Merge "WindowManager: fix clipping" into lmp-dev
* commit '
4a35f41a29855cbb22dacec1bf8a0eb0d9ded388':
WindowManager: fix clipping
Robin Lee [Wed, 23 Jul 2014 22:41:31 +0000 (23:41 +0100)]
Show disclosure when an intent switches profiles
If an activity in one profile starts an activity in another profile
without any user interaction - such as operating the chooser - a toast
appears, saying something like 'you are using this app in your work
space'.
@bug
14375080
Change-Id: Id2dc5973a9b68ee29d0227947c19b78f021fb6ac
Sungsoo Lim [Thu, 24 Jul 2014 08:14:57 +0000 (17:14 +0900)]
Fix typo
Change-Id: Ied87356fae0fff1bc5a0c80223351423a81ea0ce
Ji-Hwan Lee [Mon, 21 Jul 2014 19:46:30 +0000 (04:46 +0900)]
TIF: Support HDMI-CEC active source management
Add system API TvView.setMain() and TvInputService.onSetMain().
Bug:
15994065
Change-Id: I60ac24659453ca616380993c4accd8c17e714639
Baligh Uddin [Thu, 24 Jul 2014 03:54:38 +0000 (20:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I87b29540fb7b62fe887fba886a2326aa06e78442
Auto-generated-cl: translation import
Nick Kralevich [Thu, 24 Jul 2014 03:52:19 +0000 (03:52 +0000)]
am
c91b2735: OsConstants: add PR_GET_DUMPABLE / PR_SET_DUMPABLE
* commit '
c91b2735231d7e4428efa33f453d15d1709568f4':
OsConstants: add PR_GET_DUMPABLE / PR_SET_DUMPABLE
Nick Kralevich [Thu, 24 Jul 2014 03:40:25 +0000 (20:40 -0700)]
OsConstants: add PR_GET_DUMPABLE / PR_SET_DUMPABLE
Expose PR_GET_DUMPABLE and PR_SET_DUMPABLE via java.
Change-Id: Ibb60ed1d00c3a84fa77a34d0acc56cb995d14e1c
Wei Wang [Thu, 24 Jul 2014 03:33:31 +0000 (20:33 -0700)]
Move AdvertiseData length check to BluetoothAdvertiser.
This will keep AdvertiseData simple and avoid coupling with
BluetoothAdapter.
Change-Id: I3609652bdea1c6e757bac7d2dada7f8ddf20a5e3
Svetoslav [Thu, 24 Jul 2014 03:24:18 +0000 (03:24 +0000)]
am
f214b4ce: Merge "Handle wrong file format when printing." into lmp-dev
* commit '
f214b4ceb7b728931e2576d9b0a4d782980aedef':
Handle wrong file format when printing.
Alan Viverette [Thu, 24 Jul 2014 03:24:13 +0000 (03:24 +0000)]
am
5e9d2bfb: Merge "Allow medium-long-press to initiate drag-to-open menus" into lmp-dev
* commit '
5e9d2bfb0321c7711a274f25c673da814624155b':
Allow medium-long-press to initiate drag-to-open menus