Vinit Deshapnde
402334a09b
Merge "Fix an exception caused by incorrect data handling" into klp-dev
2013-08-26 21:50:20 +00:00
Tom O'Neill
a324ac7875
Address API council comments on location mode API council
...
- Start fixing b/10461763
Change-Id: Ic5305bdca38329765a1de565c0a25da12e8ab19d
2013-08-26 14:40:23 -07:00
Adam Powell
0da4a282ee
Expand documentation around ViewParent#childHasTransientStateChanged
...
Bug 10461020
Change-Id: Id27df5de171b01effae949bcb1ce69bd4101b5ee
2013-08-26 21:33:03 +00:00
Adam Powell
962a7093be
Fix padding for simple_list_item_2
...
Bug 9267688
Change-Id: I33270d9661581e116e16fd9216387a4fbdd72351
2013-08-26 21:00:56 +00:00
Chris Craik
ff2c22e2a8
Merge "Move functor GL setup to just before functor" into klp-dev
2013-08-26 20:50:50 +00:00
Alan Viverette
aad4417868
Merge "Use transient state to preserve accessibility focus in ListView" into klp-dev
2013-08-26 20:49:50 +00:00
Alan Viverette
faf7a2087e
Merge "Add auto-scrolling in ListPopupWindow drag-to-open mode" into klp-dev
2013-08-26 20:49:28 +00:00
Alan Viverette
9212e350d5
Merge "Reconcile drag-to-open and touch event interception" into klp-dev
2013-08-26 20:48:59 +00:00
Leon Scroggins III
3871fdb966
Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-dev
2013-08-26 20:47:23 +00:00
Edward Jee
b2cc1d54aa
Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev
2013-08-26 20:33:45 +00:00
Igor Murashkin
9e680685f9
Merge "camera2: CameraDevice#configureOutputs now deletes unused streams" into klp-dev
2013-08-26 20:22:14 +00:00
Scott Main
0ef8a431a5
am 032c5630: am bb6b1ff0: am d608d5e3: add jb mr2 uses-feature items to reference page and fix a couple doc bugs
...
* commit '032c56305eb69fcbf0d0baa8dd0276d3821bc0b7':
add jb mr2 uses-feature items to reference page and fix a couple doc bugs
2013-08-26 13:15:35 -07:00
Scott Main
032c56305e
am bb6b1ff0: am d608d5e3: add jb mr2 uses-feature items to reference page and fix a couple doc bugs
...
* commit 'bb6b1ff012edac329bf4c3e7121651220259e64c':
add jb mr2 uses-feature items to reference page and fix a couple doc bugs
2013-08-26 13:12:20 -07:00
Scott Main
bb6b1ff012
am d608d5e3: add jb mr2 uses-feature items to reference page and fix a couple doc bugs
...
* commit 'd608d5e3fa08cd9935f03144b192ea5934c715a8':
add jb mr2 uses-feature items to reference page and fix a couple doc bugs
2013-08-26 13:09:46 -07:00
Scott Main
d608d5e3fa
add jb mr2 uses-feature items to reference page and fix a couple doc bugs
...
Change-Id: I1b95d98b083af3dad55f19a9e68f69460d4e6e57
2013-08-26 12:49:39 -07:00
John Spurlock
f8388885e4
Merge "Add new logging for system bar window state." into klp-dev
2013-08-26 19:43:26 +00:00
John Spurlock
0ec64c65fb
Add new logging for system bar window state.
...
And re-enable PhoneStatusBar dump output in bugreports.
Bug:10488453
Change-Id: If39b32e82dee59f3c166c5a948d379030da0ea01
2013-08-26 15:37:58 -04:00
Craig Mautner
2703052413
Hide stackId from prying eyes.
...
Member variable does not have to be publicly visible.
Fixes bug 10461556.
Change-Id: I9aeaf4f451738b1d6dc0289afb1deae6e8f7e5c2
2013-08-26 12:27:01 -07:00
Ying Wang
d3373c292a
Merge "Better aidl generated dependency" into klp-dev
2013-08-26 19:18:35 +00:00
Wink Saville
3084eb999a
am 59adfca6: (-s ours) am 33283a97: am dce52cdb: DO NOT MERGE: MDST is not ready until connected to DcTracker.
...
* commit '59adfca65dc35274684831577ec41046b418a688':
DO NOT MERGE: MDST is not ready until connected to DcTracker.
2013-08-26 11:53:14 -07:00
Wink Saville
59adfca65d
am 33283a97: am dce52cdb: DO NOT MERGE: MDST is not ready until connected to DcTracker.
...
* commit '33283a9726a29b5a79d7885fe194d52c0ebe7450':
DO NOT MERGE: MDST is not ready until connected to DcTracker.
2013-08-26 11:50:10 -07:00
Wink Saville
33283a9726
am dce52cdb: DO NOT MERGE: MDST is not ready until connected to DcTracker.
...
* commit 'dce52cdbf1eab8bd979bf4676973699c39f7b32e':
DO NOT MERGE: MDST is not ready until connected to DcTracker.
2013-08-26 11:47:20 -07:00
Wink Saville
3a9a4c2a10
am 4e6e1749: am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported.
...
* commit '4e6e1749eda5a2c84538b0064fdc219aab3605e1':
In isMobileOk don't execute finally if mobile data is not supported.
2013-08-26 11:46:29 -07:00
Wink Saville
4e6e1749ed
am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported.
...
* commit 'b42beeafcf8117fb4ac41dd91fc9e6113c0d6aae':
In isMobileOk don't execute finally if mobile data is not supported.
2013-08-26 11:43:25 -07:00
Leon Scroggins III
2cc409ae52
Fix unpremul setting in BitmapRegionDecoder.
...
requireUnpremultiplied should be the opposite of BitmapOptions.
inPremultiplied, as in BitmapFactory.
Fixes CTS tests.
BUG=10490308
Change-Id: I21b8c057ccdc9b35c69730a7fe8c3b6802ee6dd8
2013-08-26 14:41:58 -04:00
Wink Saville
b42beeafcf
am e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported.
...
* commit 'e63411f28b81a0c9f7fee1d0b3a0765606c9a6f2':
In isMobileOk don't execute finally if mobile data is not supported.
2013-08-26 11:40:36 -07:00
Chris Craik
54f574acf4
Move functor GL setup to just before functor
...
bug:10399469
Because the stencil setup can issue draws, it *must* come before the
GL state setup.
Change-Id: I52a36213549fc60b091a90cbb923a1f0d35f9a65
2013-08-26 11:23:46 -07:00
Jean-Michel Trivi
22e3eb64bf
"Year" is an authorized metadate long field.
...
MediaMetadataRetriever.METADATA_KEY_YEAR is listed as one of the
supported long fields but is not declared in the list of authorized
long keys.
Change-Id: If277f0c300e2bfed10472e23a2eeba08bfa6ed33
2013-08-26 11:23:32 -07:00
Igor Murashkin
57ea59b376
camera2: CameraDevice#configureOutputs now deletes unused streams
...
Bug: 10461554
Change-Id: I3dc48e434d83b18909d25723cc8855c82e1072bc
2013-08-26 11:09:40 -07:00
Tom O'Neill
4a7c49c81f
Address API Review for SettingInjectorService
...
- Escape < and > in javadoc
- Constructor does not take log tag
- Start intent rename
- Comments for Status.summary and enabled
- Bonus fixes:
- Start renaming STATUS_KEY to SUMMARY_KEY
- Send message back even if getting the status fails so we don't have
to wait for the fetch to time out
- Add comment about setting activity being invoked when disabled
- Partial fix for b/10461474
Change-Id: I025e7e0782c2873a4eda20ab4793bc6145daf8db
2013-08-26 10:08:12 -07:00
Baligh Uddin
0c96890b33
Import translations. DO NOT MERGE
...
Change-Id: I6b1373d144c4cfcce6f514051adbd179373180bf
Auto-generated-cl: translation import
2013-08-26 09:53:28 -07:00
Baligh Uddin
dc6c5a9950
Import translations. DO NOT MERGE
...
Change-Id: I90a32d22c5c97408ef96635be46c069c22fddca7
Auto-generated-cl: translation import
2013-08-26 09:45:01 -07:00
Baligh Uddin
a943688bb0
Import translations. DO NOT MERGE
...
Change-Id: I7be513f3d5decec282200b01900ce480fcf291cf
Auto-generated-cl: translation import
2013-08-26 09:42:10 -07:00
Jeff Tinker
91b87de7e1
Merge "Enhancement for OnInfo callback on DRM Framework" into klp-dev
2013-08-26 16:09:08 +00:00
Daniel Sandler
fead1290d7
Make xxhdpi adb icon consistent with other densities.
...
Bug: 10487353
Change-Id: I50441587988d36e94cfb453ab9706b0ae46b066b
2013-08-26 11:04:02 -04:00
Scott Greenwald
6341010997
Change DBG to false to eliminate logcat messages.
...
DemoContactNotificationScorer was spamming logcat because DBG was
set to true. Also changed TAG to match the class name.
Bug: 10457063
Change-Id: Idca251b5b46d58ab64407e94ed4bec831e880aa4
2013-08-26 14:59:44 +00:00
Ying Wang
9436631333
Fix docs build.
...
Change-Id: I3299e59fd90141fee324129ff3b251bdf8f60f10
2013-08-23 22:20:03 -07:00
Fabrice Di Meglio
138de8e16d
Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()
...
- be aware that getCurrentHour() value can vary with "mIs24HourView"
- so force no notification of onTimeChanged() for setCurrentHour() when
we are just changing 12h/24h view
Change-Id: I358eda29cf0c66a811cde494136d7cfc27fca39f
2013-08-23 19:38:05 -07:00
Jim Miller
14cabdabac
Merge "Add setting to disable keyguard widgets" into klp-dev
2013-08-24 01:28:28 +00:00
Takeshi Aimi
6fd97b7d93
Enhancement for OnInfo callback on DRM Framework
...
In DRM framework, plugins can transmit DrmInfoEvent to Java layer.
Although DrmInfoEvent has several entries, current implementation
can only convey integer and String. This change enables plugins
uto propagate a hashmap to Java layer. The hashmap can have
one or more Strings and one byte array as value.
Changes are made by Sony Corporation.
bug: 10459159
Change-Id: I5f2bfb43b676863ef4d220fd4ef1e48777e92752
(cherry picked from commit 84a5b5cab40711e20ba70c5ed4dfeab6b558b53b)
2013-08-23 18:02:40 -07:00
Jeff Brown
61d806c76a
Merge "Docs changes pursuant to API review feedback." into klp-dev
2013-08-24 00:47:16 +00:00
Jeff Brown
511cd35fcc
Docs changes pursuant to API review feedback.
...
Change-Id: I74c51791192f7fefad4e299d25c91438cbf6ab73
2013-08-23 17:44:47 -07:00
destradaa
9e73cce6ac
Merge "Fix leaks of JNI objects in the local reference table" into klp-dev
2013-08-24 00:44:37 +00:00
Jim Miller
f45bb40388
Add setting to disable keyguard widgets
...
This allows disabling keyguard widgets through Settings.
On new devices, the setting is turned off by default. If the
user currently has widgets in keyguard, then we keep them
and re-enable the setting.
Change-Id: I7258921231d439925ac8627105710efa99309094
2013-08-23 17:36:30 -07:00
destradaa
b75cb3aeb4
Fix leaks of JNI objects in the local reference table
...
Change-Id: I769502f8b13e0025707abdf98c24f2cac0604602
2013-08-23 17:26:16 -07:00
Ying Wang
0f91c63602
Better aidl generated dependency
...
Previously if an imported aidl file has been deleted or moved,
the generated dependency file still contains the stale file name,
and make will fail with "No rule to make target <the deleted/moved
file>".
This change uses technique described in section "Automatic Dependency
Generation", Chapter 8 of "Managing Projects with GNU Make (3d
Edition)".
The same technique is used by the Android platform build system to
generate C/C++ header dependencies.
Bug: 10459179
Change-Id: Ib0c01a4234ef1af994487fdc846cdf8d13a675f6
2013-08-23 17:19:17 -07:00
Tim Murray
c264e04400
Merge "Add garbage collection hooks" into klp-dev
2013-08-23 23:40:48 +00:00
Chong Zhang
5de1faca16
Merge "wifi-display: add certification options" into klp-dev
2013-08-23 23:18:52 +00:00
Jeff Sharkey
365768fd35
Merge "Return EXIF thumbnails when available." into klp-dev
2013-08-23 23:18:11 +00:00
Jeff Sharkey
98d6212327
Merge "Add CancellationSignal support to file operations." into klp-dev
2013-08-23 23:17:47 +00:00