Brad Fitzpatrick
36bafb0b7d
am 0ddcc8bc: am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
...
* commit '0ddcc8bc60ffa00e103f420f95b7f8a7c77639b6':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
2011-03-30 16:38:03 -07:00
Brad Fitzpatrick
b9d173ce8f
am f6809853: am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
...
* commit 'f68098534e42b33cd4588bb2d2ba34ab579e11aa':
Unregister callback from binder when vibration is removed
2011-03-30 16:37:58 -07:00
Mike Lockwood
d0b4e9611d
am 08d5de83: am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
...
* commit '08d5de83393dbd4d31893d96e4871a8a3628a2cd':
UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-30 16:33:40 -07:00
Jeff Hamilton
f9fb0abbd6
am 0c691f0e: am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID.
...
* commit '0c691f0eb3bc844e778f9a61e777076658879dfd':
Update the value for the NFC shared UID.
2011-03-30 16:31:27 -07:00
Teng-Hui Zhu
29c7ae5c60
Merge "Buffering in full screen mode will show progressView"
2011-03-30 16:19:07 -07:00
Teng-Hui Zhu
f4d4e9e05f
Buffering in full screen mode will show progressView
...
bug:4187252
Change-Id: Ieb7ae26b5bfa9abc79556e2fc063b7e3ef17ab52
2011-03-30 16:05:27 -07:00
Mathias Agopian
a51e9fd53d
Merge "Revert "retire android_native_window_t""
2011-03-30 15:30:39 -07:00
Mathias Agopian
2c34190702
Revert "retire android_native_window_t"
...
this type is still used by partner's source trees.
we will get rid of it in next release's timeframe.
This reverts commit 7b49b976277cb3538242151e7dbd24681ddec73e.
2011-03-30 15:28:21 -07:00
Andreas Huber
790ac975d2
Merge "Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files"
2011-03-30 13:48:10 -07:00
Andreas Huber
cabb7da712
Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files
...
Change-Id: I6e1e989c43300ddb0d341e3e9183cdccd69eeae6
related-to-bug: 4192562
2011-03-30 13:13:25 -07:00
Daniel Sandler
5317509129
Merge "Add missing dimension resource."
2011-03-30 12:56:09 -07:00
Daniel Sandler
bdf37690f3
Add missing dimension resource.
...
Bug: 4192397
Change-Id: I1912fffc8800ef522063bf42ffe08e752ae1350f
2011-03-30 15:25:38 -04:00
Fabrice Di Meglio
4111bec3b6
Merge "Fix text redering issue where the text was sometimes truncated"
2011-03-30 12:01:52 -07:00
Adam Powell
5251940341
Merge "Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use"
2011-03-30 11:48:58 -07:00
Winson Chung
53ecd4f5cf
Merge "Deprecating old RemoteViews API which takes appWidgetId when setting the RemoteViewsAdapter intent."
2011-03-30 11:44:08 -07:00
Adam Powell
54ab310e60
Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use
...
Change-Id: Ieb8127772cd62663d11ef893b47f9b2c7068391c
2011-03-30 11:34:00 -07:00
Andreas Huber
fc2143473a
Merge "Stagefright DataSources now expose the underlying content mime type."
2011-03-30 11:26:04 -07:00
Andreas Huber
a2e57ca650
Stagefright DataSources now expose the underlying content mime type.
...
Use that mime type to determine if we should do upfront buffering at the start of
playback and don't for audio streams to ensure playback starts fairly instantly.
Change-Id: If21e36d1b024f0e5c723911bceadaa2e0307ab42
related-to-bug: 4090916
2011-03-30 11:15:27 -07:00
James Dong
4d3cdb5515
Check whether WAVE extractor can be initialized successfully in the sniffer for WAVE
...
bug - 3373994
Change-Id: I91c420815caae3b868fe9184ba48f37046b495fb
2011-03-30 10:54:58 -07:00
Winson Chung
037300bba5
Deprecating old RemoteViews API which takes appWidgetId when setting the RemoteViewsAdapter intent.
...
Change-Id: I72edaa839ae0633a1a24d8f69f5f8c664832ed30
2011-03-30 09:37:09 -07:00
Mike Lockwood
3164a497a8
Merge "Remove logging from HardwareService flashlight calls"
2011-03-30 09:24:09 -07:00
Brad Fitzpatrick
0ddcc8bc60
am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
...
* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
2011-03-30 08:20:58 -07:00
Brad Fitzpatrick
f68098534e
am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
...
* commit '7a84a60d569ef7373fbb6418026b935d48fcd7e7':
Unregister callback from binder when vibration is removed
2011-03-30 08:20:51 -07:00
Jeff Brown
163ac289ae
Merge "Support primitive ALT-TAB style navigation using Recent Apps."
2011-03-30 02:33:44 -07:00
Brian Carlstrom
07fe409787
Merge "SamplingProfilerIntegration and SamplingProfiler improvements (3/3)"
2011-03-29 22:35:40 -07:00
Mike Lockwood
08d5de8339
am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
...
* commit 'cd90d1f1173c344738362d24bdc637c355b75645':
UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:17:36 -07:00
Mike Lockwood
cd90d1f117
am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
...
* commit '44e4b99f823a6d6131f94e67389b705d3b124c0a':
UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:16:17 -07:00
Mike Lockwood
44e4b99f82
Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
2011-03-29 22:14:27 -07:00
Fabrice Di Meglio
eee49c699c
Fix text redering issue where the text was sometimes truncated
...
- mostly was visible in Settings apps / Wi-Fi networks summary info for each network
- correctly setup the local SkPaint for advances computation
- improve test app for adding live resizing
Change-Id: Ia031fe1b115b521ba55c7e68f2a26300f02e48ca
2011-03-29 19:44:33 -07:00
Romain Guy
a3cbe69ae6
Merge "Move the drawable state to the correct class. Bug #4170455 "
2011-03-29 18:33:12 -07:00
Romain Guy
2660a3ec85
Move the drawable state to the correct class.
...
Bug #4170455
The state tracking whether the Paint's shader should be rebuilt was kept in the
wrong class. This lead to the Drawable keeping track of the dirty status of the
Paint stored in the ConstantState. This of course does not work properly when
several drawables are inflated form the same ConstantState. This change fixes
the issue by moving the dirty Paint state to the ConstantState class. This is
allowed to work because of the single-thread rule enforced by the UI toolkit.
Change-Id: I9bb31d8e7335d6bb418470b59ae25d9085d7bd23
2011-03-29 18:31:08 -07:00
Jeff Brown
8c769cb9cc
Support primitive ALT-TAB style navigation using Recent Apps.
...
Change-Id: I6dc774326c971826d160c82126fb39acb5b9124b
2011-03-29 17:26:44 -07:00
Wink Saville
03128c2880
am 8a395624: am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
...
* commit '8a395624042ed06732703c4e272ad416a45ecf10':
Cleanup DataConnectionTracker
2011-03-29 17:00:11 -07:00
Mike Lockwood
4f0f3561ed
UsbService: Make USB disconnect handling for accessory mode more robust
...
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level. On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.
Change-Id: I35d458f21a8b21611946da523d0f53723cab0540
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-29 16:59:38 -07:00
Eric Fischer
2482920309
am c9e5464b: (-s ours) am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'c9e5464b06aa6abb8db60094483a0d353515fb67':
Import revised translations. DO NOT MERGE
2011-03-29 16:59:35 -07:00
Eric Fischer
f3336393d1
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-03-29 16:59:31 -07:00
Teng-Hui Zhu
1ef63fd2ed
Merge "Add the loading progress UI when buffering"
2011-03-29 16:58:19 -07:00
Amith Yamasani
95cba338e9
am 342f38f9: am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
...
* commit '342f38f9a95e26b20ebaaac6402409beb9ba96f8':
Fix the javadoc for LocationManager.requestSingleUpdate()
2011-03-29 16:58:16 -07:00
Christopher Tate
fea9ab5421
Merge "Add view/drawable states for drag-accepting / drag-hovered"
2011-03-29 16:49:46 -07:00
Jeff Hamilton
0c691f0eb3
am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID.
...
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
Update the value for the NFC shared UID.
2011-03-29 16:28:49 -07:00
Dmitry Shmidt
829f8e5ae5
Merge "bugreport: Add ping wlan gateway, dns1 and dns2 servers"
2011-03-29 16:28:00 -07:00
Dmitry Shmidt
9abfeb4123
bugreport: Add ping wlan gateway, dns1 and dns2 servers
...
Change-Id: I91c2b9be217fabe8f854c637c972377bc811cca8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-29 16:21:12 -07:00
Jeff Brown
6e923274c5
Merge "Support chorded fallback keys."
2011-03-29 16:19:46 -07:00
Jeff Brown
da3d5a91b6
Support chorded fallback keys.
...
Also be more careful about canceling fallback keys during focus
transitions, when the application handles the key, or when the
policy decides to do something different.
Fixed a crash due to JNI CallObjectMethod returning an undefined
value (not null) when an exception is thrown.
Fixed a crash due to the policy trying to create a Dialog for
recent apps on the dispatcher thread. It should happen on the
policy's Looper instead.
Bug: 4187302
Change-Id: I659a3fd1bd2325ed36d965f9beb75dacb89790c9
2011-03-29 16:16:55 -07:00
Christopher Tate
3d4bf17f49
Add view/drawable states for drag-accepting / drag-hovered
...
Added new drag_can_accept and drag_hovered XML attributes and the View
logic to support them. Drawable states are now refreshed automatically
when a drag starts/ends and when a drag crosses the boundary of a
participating view.
Change-Id: I25f8ee02c83b3fa4f27201997d7eabf4be653fd8
2011-03-29 15:27:58 -07:00
James Dong
5c8eff3308
Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc"
2011-03-29 15:17:47 -07:00
Marco Nelissen
30ec6c2bf5
Merge "Fix media scanner uri handling."
2011-03-29 15:16:55 -07:00
Wink Saville
8a39562404
am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
...
* commit 'fc151b6eb4a682510f3591879037b524bc8d59d0':
Cleanup DataConnectionTracker
2011-03-29 15:12:22 -07:00
Teng-Hui Zhu
c0fccd1292
Add the loading progress UI when buffering
...
bug:4187252
Change-Id: I0f9f2c659303b391b1be896b9a30cc6bf7455da5
2011-03-29 15:07:35 -07:00
Wink Saville
fc151b6eb4
Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
2011-03-29 14:44:56 -07:00