Ricardo Cervera
1575e1a1f5
am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs
...
* commit '419b17ec9e8520b8d38b3f8db6d6fe5b0fce1211':
docs: Added new sensor types. Bug: 10674725
2014-03-21 20:24:13 +00:00
Jinsuk Kim
a7efb93c1b
am a10958f1: am cfba284a: am d73e66cc: Fix broken build
...
* commit 'a10958f1c386851dc69a5dae2c32b899b9f29277':
Fix broken build
2014-03-21 20:23:45 +00:00
Colin Cross
6418a7d30c
am 8a60ded0: Merge "resolved conflicts for merge of a67e34c8 to master"
...
* commit '8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2':
Add HDMI-CEC service
2014-03-21 13:23:05 -07:00
Colin Cross
8a60ded026
Merge "resolved conflicts for merge of a67e34c8 to master"
2014-03-21 20:19:54 +00:00
Ricardo Cervera
419b17ec9e
am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs
...
* commit '1d77a8741c8b08c2b911e714c56521483e23bdac':
docs: Added new sensor types. Bug: 10674725
2014-03-21 20:18:29 +00:00
Ricardo Cervera
1d77a8741c
am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs
...
* commit '588300cb5211f7217b81683f8a76bdf95c7bfa8d':
docs: Added new sensor types. Bug: 10674725
2014-03-21 20:11:48 +00:00
Colin Cross
a42cb8b0e2
resolved conflicts for merge of a67e34c8 to master
...
Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
2014-03-21 13:11:02 -07:00
Ricardo Cervera
588300cb52
am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs
...
* commit '2e92965820d61b704e0eb307da70825c46d899d3':
docs: Added new sensor types. Bug: 10674725
2014-03-21 20:06:06 +00:00
Bo Liu
4474da7c74
am caf94773: Merge "Convert a attach/detach functor in ViewRootImpl to x64"
...
* commit 'caf947737d3e94d2f5d839ec1fa951df7937fdb2':
Convert a attach/detach functor in ViewRootImpl to x64
2014-03-21 13:05:57 -07:00
Ricardo Cervera
2e92965820
Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs
2014-03-21 20:01:31 +00:00
Bo Liu
caf947737d
Merge "Convert a attach/detach functor in ViewRootImpl to x64"
2014-03-21 20:00:35 +00:00
Adam Cohen
df5699bd83
am fb40d78c: Merge "Catch exceptions if Exif is malformed"
...
* commit 'fb40d78c57711585c9eaed467601bf3adb4f60f9':
Catch exceptions if Exif is malformed
2014-03-21 13:00:08 -07:00
John Reck
02e99e272d
am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
...
* commit 'ae31664390a95b1a0b80bf7aa246b8413b469ea7':
Eliminate mHasAlpha
2014-03-21 19:59:38 +00:00
Adam Cohen
aa4f41fc7a
am 146af201: Merge "Catching security exception when activity destroyed"
...
* commit '146af201d380cffa6a540fd0d52590bd9d30b614':
Catching security exception when activity destroyed
2014-03-21 12:56:46 -07:00
John Spurlock
5c076ac025
am 3daafcd7: Merge "Annotate framework vibrate calls with stream hints."
...
* commit '3daafcd7bab6e3ace72396576529e3049ab4c066':
Annotate framework vibrate calls with stream hints.
2014-03-21 12:56:43 -07:00
Adam Cohen
fb40d78c57
Merge "Catch exceptions if Exif is malformed"
2014-03-21 19:55:54 +00:00
Adam Cohen
146af201d3
Merge "Catching security exception when activity destroyed"
2014-03-21 19:54:55 +00:00
John Reck
ae31664390
am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
...
* commit 'aff40e25e8f16c3ecd20376901d7062774850023':
Eliminate mHasAlpha
2014-03-21 19:53:17 +00:00
John Spurlock
3daafcd7ba
Merge "Annotate framework vibrate calls with stream hints."
2014-03-21 19:51:44 +00:00
John Reck
aff40e25e8
am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
...
* commit 'fc603ca6b518777a7e4dc391bc771e5609ab3ab5':
Eliminate mHasAlpha
2014-03-21 19:47:22 +00:00
Selim Cinek
49c4f4e2d8
am a4c1ccf3: Merge "Disable Set Wallpaper button while loading image"
...
* commit 'a4c1ccf3e045accd321be4d4c7d2ba1941a49ab4':
Disable Set Wallpaper button while loading image
2014-03-21 12:43:52 -07:00
John Reck
fc603ca6b5
am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
...
* commit 'abf701e6751aed487d4ed0986e0fae8810c3658f':
Eliminate mHasAlpha
2014-03-21 19:41:00 +00:00
Selim Cinek
a4c1ccf3e0
Merge "Disable Set Wallpaper button while loading image"
2014-03-21 19:39:38 +00:00
John Reck
abf701e675
Merge "Eliminate mHasAlpha" into klp-dev
2014-03-21 19:37:28 +00:00
Craig Mautner
5fc6747ed6
am f7ad8557: Apply FLAG_SHOW_WHEN_LOCKED within tasks.
...
* commit 'f7ad855718dc576a1618a54035b82e92356aa0d8':
Apply FLAG_SHOW_WHEN_LOCKED within tasks.
2014-03-21 12:32:38 -07:00
Selim Cinek
5ab7d37d90
Catch exceptions if Exif is malformed
...
Bug: 11650650
Change-Id: Ie1680220fdb235a166a0eaa0a2309729f861865c
2014-03-21 20:32:34 +01:00
Selim Cinek
d6901a95d8
Catching security exception when activity destroyed
...
Fixed a bug where an asynctask tried to load an image
even after the activity was destroyed leading to a
security exception since the permission could not be granted anymore.
Bug: 12760267
Change-Id: Ieffb10b1007f349371647512ffe4fe72433344e7
2014-03-21 20:24:55 +01:00
Craig Mautner
f7ad855718
Apply FLAG_SHOW_WHEN_LOCKED within tasks.
...
If the bottommost fullscreen window of a task has FLAG_SHOW_WHEN_LOCKED
set then show all windows of the task that are above that window.
Fixes bug 13558398.
Change-Id: Ied8ada54efbb079eaf375470b2eae749e5551c24
2014-03-21 12:24:07 -07:00
Unsuk Jung
8ae2ce76e3
am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
...
* commit '7bde0fc751192fd70f6e42ddffe7f1513fc67b71':
Change wallpaper sizing
2014-03-21 19:23:46 +00:00
Unsuk Jung
7bde0fc751
am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
...
* commit '2270ac96d5d8ab6c2d1601f8dd5d8409762fb35f':
Change wallpaper sizing
2014-03-21 19:17:01 +00:00
Chris Wren
27ae6b6b9c
am 386fff99: Merge "lower the heads up threshold to exactly PRIORITY_HIGH"
...
* commit '386fff993a205f551f4e3d6f8e31e0740365f727':
lower the heads up threshold to exactly PRIORITY_HIGH
2014-03-21 12:14:10 -07:00
Unsuk Jung
2270ac96d5
am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
...
* commit '8114c3d02d6bf72c0627aea6ecf738074ac3f232':
Change wallpaper sizing
2014-03-21 19:11:01 +00:00
Chris Wren
386fff993a
Merge "lower the heads up threshold to exactly PRIORITY_HIGH"
2014-03-21 19:10:50 +00:00
Will Haldean Brown
ede2a729c3
am ccd55a92: am f8c78b50: Update current.txt to include windowSwipeToDismiss
...
* commit 'ccd55a924a51e5ad7a503b3bde4b3038152217e4':
Update current.txt to include windowSwipeToDismiss
2014-03-21 19:08:57 +00:00
Chris Wren
5d9b153db3
lower the heads up threshold to exactly PRIORITY_HIGH
...
Bug: 13452562
Change-Id: I945ce22fa7253ff84fcc3d72f4cb732921ba3489
2014-03-21 15:08:42 -04:00
Bo Liu
845535a76d
Convert a attach/detach functor in ViewRootImpl to x64
...
Change-Id: I93c1df8abd0ecd1686e392cada099f9864926d33
2014-03-21 12:06:23 -07:00
Unsuk Jung
8114c3d02d
am 1a70f391: Merge "Change wallpaper sizing" into klp-dev
...
* commit '1a70f391608e82fcc5550c76ccc7bf8bac5bbc10':
Change wallpaper sizing
2014-03-21 19:05:40 +00:00
Will Haldean Brown
ccd55a924a
am f8c78b50: Update current.txt to include windowSwipeToDismiss
...
* commit 'f8c78b50fc9f6c81c7ad5d76c81445653dcf3cd9':
Update current.txt to include windowSwipeToDismiss
2014-03-21 19:02:16 +00:00
Unsuk Jung
1a70f39160
Merge "Change wallpaper sizing" into klp-dev
2014-03-21 19:01:08 +00:00
Alex Klyubin
7ae93b1d0c
am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
...
* commit '92ec0a0c7a568a77696964c16f4e44292c633ef1':
Adjust to the change in the private SSLParameterImpl API.
2014-03-21 18:53:20 +00:00
Alex Klyubin
92ec0a0c7a
am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
...
* commit 'd8c32164e19d16cf7d66b9aee368369ae16a4f0d':
Adjust to the change in the private SSLParameterImpl API.
2014-03-21 18:47:27 +00:00
Fabrice Di Meglio
72a3b9a136
am 7434fcec: Merge "Add support for enabled state for SearchIndexableData"
...
* commit '7434fcec6928e9e570f7ab0bf033f04ca5a13ba1':
Add support for enabled state for SearchIndexableData
2014-03-21 11:44:21 -07:00
Alex Klyubin
d8c32164e1
am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
...
* commit '88517170cbb09b45324d5b457a0e5e840cc7d09b':
Adjust to the change in the private SSLParameterImpl API.
2014-03-21 11:41:38 -07:00
Fabrice Di Meglio
7434fcec69
Merge "Add support for enabled state for SearchIndexableData"
2014-03-21 18:38:58 +00:00
Fabrice Di Meglio
16f81e7542
Add support for enabled state for SearchIndexableData
...
- add "enabled" member which tells if the data will be
included into the search results.
Change-Id: I17f8c4b289b21061f7fc47f4902343fecb5ddc2c
2014-03-21 11:37:57 -07:00
Mathew Inwood
d15990aa50
Fix log spam from View.toString().
...
If a view has a non-zero ID that is not defined in resources (i.e. has been
set pragmatically), the calls to Resources.getResourcePackageName() and
Resources.getResourceEntryName() result in a log warning:
No package identifier when getting name for resource number 0x00000001
Fix this by not attempting to resolve the package & name when there is
none.
Change-Id: Id88a61539fffb36187da7911f8e8a42d5a1bb951
2014-03-21 18:37:53 +00:00
Alex Klyubin
88517170cb
Merge "Adjust to the change in the private SSLParameterImpl API."
2014-03-21 18:36:08 +00:00
Will Haldean Brown
f8c78b50fc
Update current.txt to include windowSwipeToDismiss
...
Change-Id: I5cbee85f7fe852e534a722083feead7359404732
2014-03-21 11:34:13 -07:00
Selim Cinek
0fa6c1b146
Disable Set Wallpaper button while loading image
...
Bug: 13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
2014-03-21 19:19:08 +01:00
John Reck
91f0a455bb
Eliminate mHasAlpha
...
Bug: 13580771
The cached value mHasAlpha on Bitmap could get out of sync with the
real value stored in the SkBitmap. Fix this by just eliminating the
cached value. This adds an extra JNI call in copy(), createBitmap(),
and setPremultiplied(), none of which are going to be significantly
impacted by the extra JNI call.
Change-Id: I4fce069a77d9b3bbb47dde04275ff8510ce7e4f0
2014-03-21 18:16:18 +00:00