20590 Commits

Author SHA1 Message Date
Jim Miller
fdceefd8a2 Fix 2325549: Allow up to 4 lines of summary text in Settings
This fixes a number of screens in Settings (see the bug for examples).
Though it seems like a scary change, it should be safe since
the added line doesn't affect layout unless it's used, in which
case the view is slightly taller.

Change-Id: I13d04efadee19b407febabfae7825aedf66e8744
2010-04-05 16:53:10 -07:00
Irfan Sheriff
9c50996b17 Merge "Dont start wifi if in airplane mode" into froyo 2010-04-02 12:47:45 -07:00
Suchi Amalapurapu
a77acab9c6 Merge "Handle exceptions when doing dexopt." into froyo 2010-04-02 12:46:38 -07:00
Irfan Sheriff
60e3ba071d Dont start wifi if in airplane mode
Now that wifi start is asynchronous
at the time of bring up, make sure
Wifi is not started if in airplane
mode.

Bug: 2567652
Change-Id: I947b7c8480029973bcbf028f6143aabbc88c9793
2010-04-02 12:43:04 -07:00
Andreas Huber
29039deea9 Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:18:32 -07:00
Adam Powell
219909224d Merge "Fix AbsListView scrolling behavior at edges." into froyo 2010-04-02 11:02:21 -07:00
Daniel Sandler
25642f0b16 Merge "Make desk mode work again." into froyo 2010-04-02 10:54:57 -07:00
Fred Quintana
30ed25c252 Merge "revert the stripping of System Group: from the names of google system groups" into froyo 2010-04-02 10:47:11 -07:00
Brett Chabot
c1548e3819 Merge "Add test annotations to frameworks common tests." into froyo 2010-04-02 10:24:00 -07:00
Adam Powell
b7795432a5 Fix AbsListView scrolling behavior at edges.
Allow the user to start scrolling back into content immediately
after dragging past the end of content.

Remove some dead code.

Change-Id: Ife8f60499ac58179ba1e2500ca8745916392a4bc
2010-04-02 10:21:55 -07:00
Grace Kloba
61c3a13e5f Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window's main WebView. It is only non-null if the WebView's window has the focus." into froyo 2010-04-02 09:14:39 -07:00
Jean-Michel Trivi
9ab05fff41 Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 2010-04-02 08:53:42 -07:00
Brett Chabot
680c9fa6c8 Add test annotations to frameworks common tests.
Change-Id: Iaf5af2cbd49015ac8f1bf23a4d20f055ac9a000e
2010-04-02 08:53:22 -07:00
Dave Sparks
d9c16c37ea Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo 2010-04-02 07:56:44 -07:00
Daniel Sandler
8daf2a4799 Make desk mode work again.
Bug: 2564612
Change-Id: I858a86d14a6840f5f587343a64c5d0c4bc5d5263
2010-04-02 10:15:09 -04:00
Brett Chabot
c162668e87 Merge "More framework tests cleanup." into froyo 2010-04-01 21:45:41 -07:00
Mike Lockwood
87e72cd3b3 Merge "Vibrate before shutting down." into froyo 2010-04-01 21:08:53 -07:00
Mike Lockwood
a717f64ddc Vibrate before shutting down.
BUG: 2439291

Change-Id: I0f5abba34a14f1dd1cbe2077122d6f3e940b4d90
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-01 21:07:30 -07:00
Suchi Amalapurapu
73dafa1f66 Handle exceptions when doing dexopt.
Change-Id: Iaeba98ef9fef2f1dbf3dbe2e8e4497dae8d0fe7f
2010-04-01 21:02:21 -07:00
Jim Miller
bf1259b8a6 Fix 2538826: Allow aspect of LockPatternView to be customized.
This fixes a problem where the pattern unlock area shrank on
mdpi devices.

This change is required since some devices (mdpi) don't have
enough vertical room to show a square LockPatternView and shrink
the area to match the minimum of width and height. To fix the
problem and minimize changes to existing platforms, the parameter
is configurable and has a default in values/donottranslate that
emulates the old behavior.  New behavior for mdpi devices is
specified in values-port-mdpi/donottranslate, which is the
only place we currently see the problem.

Tested:
mdpi device in both orientations
hdpi device in both orientations
hdpi device in both orientations with keyboard open/closed

Change-Id: I3b9a5ef1d9b5e70f7b1823c9f48a3938f52cc7a4
2010-04-01 19:33:03 -07:00
Brett Chabot
0dc59e78e1 More framework tests cleanup.
Move all tests for android.* classes from tests/AndroidTests and
tests/CoreTests into framework/base/<core|graphics>/tests.

Consolidate all tests for java.* classes to tests/CoreTests.
Eventually hopefully these will be moved to dalvik/ somewhere.

Remove tests/AndroidTests entirely.

Change-Id: I86584d086ab7bd045bb38a10b699907805298a95
2010-04-01 18:31:11 -07:00
Mike LeBeau
af8c900a18 Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentName.unflattenFromString." into froyo 2010-04-01 18:11:43 -07:00
Mike LeBeau
d0635d51bc Use flattenToShortString instead of toShortString on ComponentNames to
be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have
been using toShortString because that includes curly braces and is not
correctly parsed by ComponentName.unflattenFromString.

This was needed as part of http://b/2546173

Change-Id: If34a9273cbcae13a75347be0b6b7ef307134ed40
2010-04-01 18:08:34 -07:00
Dave Sparks
db6cc0ba71 Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
MediaMetadataRetriever uses a single static lock for all operations.
This effectively serializes all metadata retrieval operations in a
single process. This patch uses the object level lock for all normal
operations and only uses the static lock to serialize calls to
release.

Change-Id: I81c9f234c2f0007a26d18e1398c709b41a4dbbd7
2010-04-01 18:08:22 -07:00
Charles Chen
ddc2eb8ee3 Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo 2010-04-01 17:56:47 -07:00
Jean-Michel Trivi
55d1bb3483 Fix bug 2565463 Ensure an object cannot appear twice in the
AudioFocus stack.
 Enforce parameter check in AudioManager.requestAudioFocus()
 Typo correction in AudioService.unregisterMediaButtonEventReceiver()

Change-Id: Iedd6081a2a096bd7effbaeb9f888a31691201b3b
2010-04-01 17:40:58 -07:00
Grace Kloba
9b95ab17ec Instead of holding an ApplicationContext, JWebCoreJavaBridge
will have a reference of the current window's main
WebView. It is only non-null if the WebView's window
has the focus.

Extract setActive() from onWindowFocusChanged() so
that onAttachedToWindow() can call it directly. The
old way has a mis-matching call to onWindowFocusChanged.

Fix http://b/issue?id=2559152
2010-04-01 17:40:07 -07:00
Charles Chen
1a2712ce2a Fix for bug 2564771 - pitch setting between apps can
interfere with one another.

Root cause was not caching all the params that were needed.
This change fixes that bug as well as related bugs for remembering
the default engine and for making sure that the right engine is
loaded when checking for language availability.

Change-Id: I2a76da8faec8112036e68d27539db444c53a1509
2010-04-01 17:39:15 -07:00
Yu Shan Emily Lau
e11bafec8d Add the test template for the media audio manager test.
Change-Id: I55b5de0c55dbfded8d972f7378da3c19a613978c
2010-04-01 16:11:49 -07:00
Mike LeBeau
e134279ffa Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173" into froyo 2010-04-01 15:30:51 -07:00
Mike LeBeau
6af5ad5e61 Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
search (not just for in-app search). Needed as part of http://b/2546173

Change-Id: I661ff52bace754459651eacd369a19e97364c3c6
2010-04-01 15:29:46 -07:00
Gilles Debunne
83d4eb6c4f Merge "Refactor in PositionTesterContextMenuListener." into froyo 2010-04-01 14:47:00 -07:00
Brett Chabot
f611861735 Merge "Remove FrameworkTest package." into froyo 2010-04-01 14:36:36 -07:00
Fred Quintana
e8b1971c7b Merge "allow null authtokens to invalidateAuthToken" into froyo 2010-04-01 14:27:00 -07:00
Fred Quintana
f35b68f2b9 allow null authtokens to invalidateAuthToken
Change-Id: I78e91ef2f43503e13386894851f0d781583a4943
http://b/issue?id=2561519
2010-04-01 14:26:32 -07:00
Brett Chabot
bd4288f418 Remove FrameworkTest package.
The only remaining test here was RingtonePickerActivityTes, which has been
suppressed since pre-donut.

Change-Id: I74c08c9c9447b67252430db3b462373af879bd1d
2010-04-01 12:05:26 -07:00
Derek Sollenberger
11fb614460 Match RFC requirement that the domain portion of a cookie should be case-insensitive.
fixes bug #2549818.

Change-Id: I1372171568828545e78690f1ddc0ddcf25ddd428
2010-04-01 14:53:06 -04:00
Fred Quintana
d316258285 revert the stripping of System Group:
from the names of google system groups

Change-Id: I677a7abb42a0c3d70d7e7009325f76a4644f1cb1
http://b/issue?id=2558197
2010-04-01 11:43:57 -07:00
Andreas Huber
eea1eefead Support another kind of iso mpeg4 file.
Change-Id: I052aa1c971c577e50679b6a9263acd32895906c7
related-to-bug: 2558114
2010-04-01 11:42:50 -07:00
Gilles Debunne
13c9a1f490 Refactor in PositionTesterContextMenuListener.
The asserts were removed from that class and replaced by a status String object.

This allows ExpandableListTester to do the asserts instead.
These tests passed on a sapphire and passion devices as well as in the emulator.
The asserts in the main thread are expected to make these tests pass during the
continuous build too.

This is 7fbddb1db1beeac7c6762fb7a11612e348f6ff90 cherrypicked to froyo.

http://b/issue?id=2525846
2010-04-01 10:37:53 -07:00
Dirk Dougherty
2d8234b73d Merge "doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo 2010-04-01 10:35:21 -07:00
James Dong
ccc17b34fe Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo 2010-04-01 10:33:45 -07:00
Robert Greenwalt
33eb7767fb Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 2010-04-01 10:19:57 -07:00
Kristian Monsen
70c22a48e6 Merge "Fix for bug 2558156: Encodig is null" into froyo 2010-04-01 09:54:47 -07:00
Kristian Monsen
d08127fff1 Fix for bug 2558156: Encodig is null
This does not actually pass the test since the test has wrong expectations, but it is at least doing the right thing.

Change-Id: I7da29a3f101647bb628805514cf2bdef24864e50
2010-04-01 17:38:07 +01:00
Dirk Dougherty
3d5f648f8f doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
Change-Id: I1d2b80b8dc3f8b2e3c1befcbb7c4c522d78a2db8
2010-04-01 09:16:08 -07:00
Dave Sparks
49e5a4c5be Update AMR codec.
Change-Id: I8ecd2712863f6962b762f26898002912d1c77afb
2010-04-01 09:16:05 -07:00
Ben Murdoch
352cf1a45e Merge changes Ic9531e3c,I3f04433b into froyo
* changes:
  Cherry pick from master.
  Cherry pick from master.
2010-04-01 08:42:14 -07:00
Steve Block
2bb2553a20 Cherry pick from master.
Fixes DumpRenderTree to re-use HTTP authentication credentials

This is required for layout test http/tests/appcache/auth.html

Bug: 2098423
Change-Id: Ic9531e3c23a2fa9ebfab70cde3172550f572a404
2010-04-01 16:39:53 +01:00
San Mehat
91cac64cd0 NetworkManagementService: Add interface counters & throttle API
Change-Id: I4976549cdbb027ba7859335e69bf866e738961c9
Signed-off-by: San Mehat <san@google.com>
2010-04-01 08:34:20 -07:00