Joe Malin
409db558b3
am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
...
* commit 'a3d68aedfbd21c340ff7c76394b8b9dfca67ae13':
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
2011-05-31 16:43:55 -07:00
Joe Malin
a3d68aedfb
am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
...
* commit 'd40a5d5cb754b132d6c10ae78a6214f38ed23f3d':
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
2011-05-31 16:40:59 -07:00
Joe Malin
d40a5d5cb7
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
...
Change-Id: I48ddc26d4fc8e2e44627cfb0e98d9f0b596042b6
2011-05-31 16:36:04 -07:00
Fabrice Di Meglio
83fa41b06e
Fix TextView potential NPE in isLayoutRtl()
...
- test if mDrawables can be null
- see bug #4517017 (was seen with Monkeys)
Change-Id: I07f04c88a238d1cae6fe89b0ab56fc2c456b8534
2011-05-31 16:35:18 -07:00
Robert Greenwalt
a4e82851e9
Remove redundent getCurrentCdmaDataConnectionState
...
replace with existing and generic getCurrentDataConnectionState.
bug:3487138
Change-Id: I8a5e85afd316252eedeacb2a042450124702defd
2011-05-31 16:25:58 -07:00
Mike Lockwood
b0aee3ee43
Merge "Move stringToFile utility from ConnectivityService to FileUtils"
2011-05-31 16:14:08 -07:00
Jeff Brown
b530abcff5
am 3f5b95b0: am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
...
* commit '3f5b95b05efcf7ab2e8f193649b841dc1786f2ef':
Touch pad UX improvements.
2011-05-31 16:03:07 -07:00
Jeff Brown
e129509422
am fd86ab8a: (-s ours) am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
...
* commit 'fd86ab8a0f15bb15a8c274b8ea61743216f39532':
Fix deadlock in dispatcher. (DO NOT MERGE)
2011-05-31 16:02:54 -07:00
Adam Powell
60761f4fa5
am 31caa0e6: am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
...
* commit '31caa0e6e5c83cb03518ffe423ea5e37e452c8ae':
Updated popup dialog 9 patches (light)
2011-05-31 16:02:41 -07:00
Joe Onorato
7052f307f4
am 7f818d0a: am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2
...
* commit '7f818d0a97ecd7793811ff5549a4b67521d93f49':
Move status bar icons to sw600.
2011-05-31 16:02:26 -07:00
Jeff Hamilton
e00ef00873
am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
...
* commit '7c324a3f7dde4be26b7a996b485a92ba25de3251':
Swap Mifare for MIFARE.
2011-05-31 16:00:46 -07:00
Jeff Brown
7e193916c0
am 425f2a6d: am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
...
* commit '425f2a6d71b3af058630367d75b0b924bf1aee49':
Use ViewConfiguration to seed input system configuration.
2011-05-31 15:51:21 -07:00
Jeff Brown
f257c4b575
am 1311455f: am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '1311455f3ee8cbd2b2b83ec2d98e95e1da108743':
Button state should reflect actual buttons. (DO NOT MERGE)
2011-05-31 15:50:59 -07:00
Jeff Brown
425f2a6d71
am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
...
* commit 'c272d4279493000928b8b7c6dbcf2d2b7d8d08b2':
Use ViewConfiguration to seed input system configuration.
2011-05-31 15:44:04 -07:00
Jeff Brown
1311455f3e
am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
...
* commit 'd854304c2bcadbda37a7f1b24723dbc0030073ca':
Button state should reflect actual buttons. (DO NOT MERGE)
2011-05-31 15:44:01 -07:00
Jeff Brown
c272d42794
Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
2011-05-31 15:42:18 -07:00
Jeff Brown
d854304c2b
Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
2011-05-31 15:42:08 -07:00
Joe Onorato
256801780f
Merge "Merge commit 'fce12613' into HEAD"
2011-05-31 15:35:11 -07:00
James Dong
a9d0febdd0
Send estimated bandwidth value as informational event when cache fetcher pauses
...
o Application can make informed decision about the available network bandwidth
when cache fetcher pauses.
o Application can also adjust how frequently the bandwidth is estimated within
a range from one second to one minute.
Change-Id: I90068001343e79da1886de03c565537787e1580b
2011-05-31 15:23:25 -07:00
Jeff Brown
214eaf4887
Use ViewConfiguration to seed input system configuration.
...
Fix bug where the pointer presentation would be updated on
any input reader timeout rather than only when a pointer gesture
is in progress.
Bug: 4124987
Change-Id: Ie9bba4a0b3228d55e45e65fa2ede5cd6ba887a08
2011-05-31 15:00:59 -07:00
Jeff Brown
4e3f7206eb
Button state should reflect actual buttons. (DO NOT MERGE)
...
Bug: 4124987
Change-Id: If0585bd1432c8c61ed0c9a6a4f6de4a62e3f6e53
2011-05-31 15:00:58 -07:00
James Dong
c51e224b0a
Merge "Add some comment to MediaRecorder.stop() about the stop() failure (-1007)"
2011-05-31 14:33:20 -07:00
Chet Haase
326e12236c
Merge "Fixes for AnimationDrawable"
2011-05-31 14:24:22 -07:00
Joe Onorato
6a045ca18f
Merge commit 'fce12613' into HEAD
...
Conflicts:
core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
core/res/res/layout/status_bar_latest_event_content_large_icon.xml
Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d
2011-05-31 14:11:58 -07:00
Amith Yamasani
42f53c7e6c
am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
...
* commit 'eb01203447afd2606b77739a0bd0b2ea216756e4':
Use Holo background and proper padding for App Permissions UI.
2011-05-31 14:06:38 -07:00
Amith Yamasani
eb01203447
am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
...
* commit '0119a67e72790fb14b05130e18fa0785b4fa8531':
Use Holo background and proper padding for App Permissions UI.
2011-05-31 14:02:11 -07:00
Amith Yamasani
0119a67e72
Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
2011-05-31 13:58:34 -07:00
RoboErik
be01039a7f
Work on changing syncx to cal_syncx
...
Change-Id: I756ff09c43f39ad52a8793011d3192d59eb574eb
2011-05-31 13:25:10 -07:00
Daniel Sandler
3a4b8bb675
Merge "Turn off navbar by default...again."
2011-05-31 13:22:30 -07:00
Daniel Sandler
37445f5026
Turn off navbar by default...again.
...
Change-Id: I8471e31f3125dda7972a579bf4cf41ee091770ca
2011-05-31 16:21:36 -04:00
Daniel Sandler
67f5e514c7
Merge "Move navigation bar to right-hand-side of seascape."
2011-05-31 13:17:33 -07:00
Amith Yamasani
ff7705e1d3
Use Holo background and proper padding for App Permissions UI.
...
Bug: 4515158
Change-Id: I47a8f2fbdc2547dd08e199ccbfa51710048963ae
2011-05-31 13:03:59 -07:00
Svetoslav Ganov
3b92427e68
Merge "Updating the API since I forgot after rebase"
2011-05-31 12:53:12 -07:00
Svetoslav Ganov
678ba5c57d
Updating the API since I forgot after rebase
...
Change-Id: I15e0f8235b2981cd637717d13f57e3b71c30575b
2011-05-31 12:52:41 -07:00
Daniel Sandler
f86f898f8a
Move navigation bar to right-hand-side of seascape.
...
This means the navbar will either be at the bottom (portrait
and reverse portrait) or the right (landscape and seascape)
irrespective of the physical bottom of the device.
Change-Id: Ib51cab22f246785c9cebcc688bcdb848eb776361
2011-05-31 15:46:14 -04:00
Joe Onorato
e36364ce0f
Merge "Reduce log spew."
2011-05-31 12:44:13 -07:00
Svetoslav Ganov
b1af3a2d1f
Merge "Accessibility serviceconfiguration via meta-data"
2011-05-31 12:05:54 -07:00
Svetoslav Ganov
cc4053e031
Accessibility serviceconfiguration via meta-data
...
Note: This is a part of two CL change and contains the
system changes without updates to the settings.
1. Added a mechanism for configuring an accessibility service via
XML file specified in a meta-data tag (similar to IMEs).
2. Added property for specifying a settings activity for an
accessibility service.
3. Refactored the APIs in AccessibilityManager to return
lists of AccessiblityServiceInfo instead ServiceInfo
since the former describes an AccessibilityService in
particular (similar to IMEs).
Change-Id: Ie8781bb7e0cdb329e583b6702a612a507367ad7b
2011-05-31 12:04:18 -07:00
Fabrice Di Meglio
798a3fe167
Merge "Fix default for getAbsoluteGravity()"
2011-05-31 11:56:59 -07:00
Gilles Debunne
da188fbe4b
Merge "Fix for bug 4499752 - Detect nulled layouts in HandleViews"
2011-05-31 10:41:58 -07:00
Martijn Coenen
fe6dfd504b
Implement Mifare Ultralight-C detection (API).
...
Bug: 3398465
Change-Id: Ieb60deedfde5af4494a14b3e322c5a61ae75aaf9
2011-05-31 10:30:56 -07:00
Marco Nelissen
e368c9a8ad
Merge "Fix crash when nesting Picture recording."
2011-05-31 10:26:17 -07:00
Eric Laurent
923da873c8
Merge "Removed interface to load audio effects libraries"
2011-05-31 10:26:00 -07:00
Marco Nelissen
9743547cde
Fix crash when nesting Picture recording.
...
b/4490619, http://code.google.com/p/android/issues/detail?id=16644
Change-Id: Ia227c87cba61e0d0b6f86b01a064a3eefe447fe1
2011-05-31 10:23:41 -07:00
Chet Haase
f5534a0785
Fixes for AnimationDrawable
...
Set up AnimationDrawable with an initial frame when it is
constructed from code (via addFrame()). This is equivalent to
what is done when it is constructed via xml resources.
Change-Id: I86784a241268aa2d03af8edecbc80a7cc3548e19
2011-05-31 07:22:51 -07:00
Kristian Monsen
2032eee0c1
Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy
...
This is the WebView part, passing the bypass list to
the native side.
Moved some code to JWebCoreJavaBridge.java because
because sendStaticMessage only takes one argument.
Needs CL in external/webkit:
https://android-git.corp.google.com/g/#change,112401
Needs following CL in external/chromium:
https://android-git.corp.google.com/g/#change,111832
Change-Id: Ib548bdcbc9eb22bbb8f2754808840052bd3ec80e
2011-05-31 14:54:51 +01:00
Tadashi G. Takaoka
e6a406753e
Merge "Fix input type judgment of WebTextView"
2011-05-31 01:55:32 -07:00
Tadashi G. Takaoka
d555e5dccc
Fix input type judgment of WebTextView
...
Bug: 4490948
Cherry-pick: I232b8f13
Change-Id: I09a7e829edd7ca8d54fa109dc14b4a3946de0f1b
2011-05-31 16:27:28 +09:00
Tadashi G. Takaoka
6d1b8995a6
am 69a48776: am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE)
...
* commit '69a487763812d2c0fb3c9900b12862997bc77f4d':
Fix input type judgment of WebTextView (DO NOT MERGE)
2011-05-31 00:23:25 -07:00
Tadashi G. Takaoka
69a4877638
am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE)
...
* commit '8ede62745faa02265f927941d1195b6c1bf05ebb':
Fix input type judgment of WebTextView (DO NOT MERGE)
2011-05-31 00:18:54 -07:00