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
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
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
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
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
Eric Fischer
c9e5464b06
am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'b8c7c66de23b9b20f3992722bb5e346d8e12dd0e':
Import revised translations. DO NOT MERGE
2011-03-29 14:19:51 -07:00
Eric Fischer
b8c7c66de2
am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '0664a4b18c3dcea82891a7389976a9d62ac7bc61':
Import revised translations. DO NOT MERGE
2011-03-29 14:15:22 -07:00
Amith Yamasani
342f38f9a9
am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
...
* commit 'c1192096627f2f9da534cb8ab7b449d6ea82123f':
Fix the javadoc for LocationManager.requestSingleUpdate()
2011-03-29 14:10:32 -07:00
Eric Fischer
0664a4b18c
am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
Import revised translations. DO NOT MERGE
2011-03-29 14:07:14 -07:00
Amith Yamasani
c119209662
am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
...
* commit '7171f5b7d16e9a0c861cc249188864385877077f':
Fix the javadoc for LocationManager.requestSingleUpdate()
2011-03-29 14:06:29 -07:00
Amith Yamasani
7171f5b7d1
Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
2011-03-29 13:55:19 -07:00
Andreas Huber
35eebbab59
Merge "Add a user-agent header to our RTSP requests."
2011-03-29 13:52:15 -07:00
Eric Fischer
b42e83b1ec
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-03-29 13:45:03 -07:00
Andreas Huber
b0e7381ccb
Add a user-agent header to our RTSP requests.
...
Change-Id: I02f8ff6a4a37fa59cc8c5fcfd3afb64ee11ba576
related-to-bug: 4173725
2011-03-29 13:34:28 -07:00
Eino-Ville Talvala
654cf011fa
Merge "Add a simple OpenGL ES 2.0 test program that displays a camera preview stream."
2011-03-29 13:34:03 -07:00
Andreas Huber
8fddd761f9
Merge "Adding support for the '.mxmf' MIDI file extension."
2011-03-29 13:33:58 -07:00
Marco Nelissen
3e5e805594
Fix media scanner uri handling.
...
If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.
Change-Id: Ifdf3a177750f1e71ca5a058fa534d272e1505653
2011-03-29 13:29:42 -07:00
Eric Fischer
df491490a6
Import revised translations. DO NOT MERGE
...
Change-Id: I09aefa0ca2ba1ff78574c8fbad2242d7ef63689d
2011-03-29 13:26:46 -07:00
Bart Sears
1fb9f21676
am 7cad54cb: (-s ours) am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
...
* commit '7cad54cb8283b67e5d4106112772dc038b7dbb40':
Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
2011-03-29 13:23:55 -07:00
Huahui Wu
4083f5227b
am 97621525: (-s ours) am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE
...
* commit '97621525c54057550dc40b38dcbe03de70cadd87':
DO NOT MERGE
2011-03-29 13:23:52 -07:00
Bart Sears
7cad54cb82
am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
...
* commit '35137d669681a0d6a22316c035ea7c8edc8fdc33':
Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
2011-03-29 13:19:07 -07:00
Huahui Wu
97621525c5
am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE
...
* commit '772f5bb1894710b0f0068d4f34e85ce38becc4b6':
DO NOT MERGE
2011-03-29 13:19:01 -07:00
Andreas Huber
eecadb9a84
Adding support for the '.mxmf' MIDI file extension.
...
Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9
related-to-bug: 4186454
2011-03-29 13:17:30 -07:00
Eric Fischer
281eced2a5
am 7d5ae753: (-s ours) am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '7d5ae7537858d6b01ae2ce12e34cb0a284138ccf':
Import revised translations. DO NOT MERGE
2011-03-29 12:30:12 -07:00
Eric Fischer
7d5ae75378
am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165':
Import revised translations. DO NOT MERGE
2011-03-29 12:27:29 -07:00
Andreas Huber
2fd376bd12
Merge "Make sure we don't trigger a log warning if calling ALooper::stop() from the looper thread."
2011-03-29 12:23:34 -07:00