48713 Commits

Author SHA1 Message Date
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
Eric Laurent
d7a724e6d8 Issue 4157048: mic gain for VoIP/SIP calls.
Herring board exhibits a strong echo even in non speakerphone modes.
To compensate the lack of AEC or AES when not in speakerphone, the mic gain
had been reduced in the ADC. But this has an adverse effect on other VoIP applications
that have their own AEC and are penalized by the weak mic gain.

This workaround enables an acceptable mic gain for other VoIP apps while offering a
SIP call experience which is not worse than it was with the residual echo that was
present even with mic gain reduction.

Change-Id: I33fd37858758e94e42ef5b545d3f0dc233220bf1
2011-03-29 18:44:03 -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
Scott Main
d3b62c961b docs: update makefile to show javadocs diffs for api level 12
Change-Id: I1ac584db778ec14b18129785126159f692459158
2011-03-29 16:25:16 -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
The Android Open Source Project
5e1383f257 am ad663d80: Merge from gingerbread
* commit 'ad663d8040ddd4f3e537117847f20d42797b429e':
  egl: fixes for object refcounts
2011-03-29 15:23:08 -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
Justin Ho
87805ca3a4 Updated CDMA roaming icons
Change-Id: Ib455c2b7196c2c2add58422187e6d752a28364c6
2011-03-29 14:43:13 -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
Jean-Baptiste Queru
bef31431ca No-op - reconcile with open-source gingerbread
Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
2011-03-29 14:05:53 -07:00
Amith Yamasani
7171f5b7d1 Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 2011-03-29 13:55:19 -07:00
The Android Open Source Project
ad663d8040 Merge from gingerbread
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
2011-03-29 13:54:43 -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
Michael I. Gold
c3fba3be74 egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
2011-03-29 13:43:54 -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