20672 Commits

Author SHA1 Message Date
Mike Lockwood
a9e1a131e3 am 87e72cd3: Merge "Vibrate before shutting down." into froyo
Merge commit '87e72cd3b327fefc39030a628e9e9b7141791d39' into froyo-plus-aosp

* commit '87e72cd3b327fefc39030a628e9e9b7141791d39':
  Vibrate before shutting down.
2010-04-01 21:12:56 -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
Jim Miller
15be35f6c9 am bf1259b8: Fix 2538826: Allow aspect of LockPatternView to be customized.
Merge commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6' into froyo-plus-aosp

* commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6':
  Fix 2538826: Allow aspect of LockPatternView to be customized.
2010-04-01 19:37:41 -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
Mike LeBeau
3079afaaf5 am af8c900a: 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 ComponentNam
Merge commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7' into froyo-plus-aosp

* commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7':
  Use flattenToShortString instead of toShortString on ComponentNames to
2010-04-01 18:14:30 -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
Charles Chen
9ea4668c3f am ddc2eb8e: Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo
Merge commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76' into froyo-plus-aosp

* commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76':
  Fix for bug 2564771 - pitch setting between apps can
2010-04-01 17:59:57 -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
Yu Shan Emily Lau
948e7dc0ab am e11bafec: Add the test template for the media audio manager test.
Merge commit 'e11bafec8d6c887c6ae95fa3d39c202859e86d48' into froyo-plus-aosp

* commit 'e11bafec8d6c887c6ae95fa3d39c202859e86d48':
  Add the test template for the media audio manager test.
2010-04-01 17:43:27 -07:00
Mike LeBeau
2e1cd1cd00 am e134279f: 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
Merge commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d' into froyo-plus-aosp

* commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d':
  Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
2010-04-01 17:42:38 -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
55686d2cda am 83d4eb6c: Merge "Refactor in PositionTesterContextMenuListener." into froyo
Merge commit '83d4eb6c4fc35bd8ce203edde0051d4def8c2cef' into froyo-plus-aosp

* commit '83d4eb6c4fc35bd8ce203edde0051d4def8c2cef':
  Refactor in PositionTesterContextMenuListener.
2010-04-01 14:49:51 -07:00
Gilles Debunne
83d4eb6c4f Merge "Refactor in PositionTesterContextMenuListener." into froyo 2010-04-01 14:47:00 -07:00
Brett Chabot
dbecc90220 am f6118617: Merge "Remove FrameworkTest package." into froyo
Merge commit 'f6118617350c0c1541550bf3a558460db562b6a4' into froyo-plus-aosp

* commit 'f6118617350c0c1541550bf3a558460db562b6a4':
  Remove FrameworkTest package.
2010-04-01 14:40:43 -07:00
Brett Chabot
f611861735 Merge "Remove FrameworkTest package." into froyo 2010-04-01 14:36:36 -07:00
Fred Quintana
2aa2f78ec5 am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo
Merge commit 'e8b1971c7b09f14f2d9a2e12399294798cf2066a' into froyo-plus-aosp

* commit 'e8b1971c7b09f14f2d9a2e12399294798cf2066a':
  allow null authtokens to invalidateAuthToken
2010-04-01 14:32:51 -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
Derek Sollenberger
4c93207940 am 11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Merge commit '11fb6144604fbd1148695421e9ab6896701a431b' into froyo-plus-aosp

* commit '11fb6144604fbd1148695421e9ab6896701a431b':
  Match RFC requirement that the domain portion of a cookie should be case-insensitive.
2010-04-01 12:06:25 -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
Dirk Dougherty
865bd884e8 am 2d8234b7: 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
Merge commit '2d8234b73d11fdc2178232cabad3ffaa23723405' into froyo-plus-aosp

* commit '2d8234b73d11fdc2178232cabad3ffaa23723405':
  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.)
2010-04-01 10:40:15 -07:00
James Dong
d12d6c305c am ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Merge commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4' into froyo-plus-aosp

* commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4':
  Public API changes for CameraProfile and CamcorderProfile classes
2010-04-01 10:40:11 -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
cab133a7fa am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
Merge commit '33eb7767fb49482643df80c8b5567da83aa0e49f' into froyo-plus-aosp

* commit '33eb7767fb49482643df80c8b5567da83aa0e49f':
  NetworkManagementService: Add interface counters & throttle API
2010-04-01 10:22:51 -07:00
Robert Greenwalt
33eb7767fb Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 2010-04-01 10:19:57 -07:00
Kristian Monsen
4ba57a4e0a am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp

* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
  Fix for bug 2558156: Encodig is null
2010-04-01 09:57:12 -07:00
Kristian Monsen
70c22a48e6 Merge "Fix for bug 2558156: Encodig is null" into froyo 2010-04-01 09:54:47 -07:00
Dave Sparks
5100df844c am 49e5a4c5: Update AMR codec.
Merge commit '49e5a4c5be2e8ba114efff8d0634a34867cb2c26' into froyo-plus-aosp

* commit '49e5a4c5be2e8ba114efff8d0634a34867cb2c26':
  Update AMR codec.
2010-04-01 09:47:58 -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
bf6913481e am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo
Merge commit '352cf1a45e26803a466d096ca2d679ea5a3ac249' into froyo-plus-aosp

* commit '352cf1a45e26803a466d096ca2d679ea5a3ac249':
  Cherry pick from master.
  Cherry pick from master.
2010-04-01 08:44:58 -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
Steve Block
0348440e4a Cherry pick from master.
This change forwards to the WebView HTTP authentication credentials that
are supplied to an XHR from JavaScript. This allows the WebView to store these
credentials for use with later requests.

This is a re-working of https://android-git.corp.google.com/g/46430

Bug: 2544330
Change-Id: I3f04433b00233d7b7bf4f7e3471d8d15d8817f93
2010-04-01 16:19:39 +01:00
Grace Kloba
fe72c533fe am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
Merge commit '461cef5d209fd072c82f6a70eb106e4690b7ef97' into froyo-plus-aosp

* commit '461cef5d209fd072c82f6a70eb106e4690b7ef97':
  As we don't support over scroll any more, we need
2010-04-01 08:17:35 -07:00
Grace Kloba
461cef5d20 Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 2010-04-01 08:15:09 -07:00
James Dong
e64d9a236e Public API changes for CameraProfile and CamcorderProfile classes
1. CamcorderProfile: “@see” links are broken; Remove m prefix from fields; remove “final”
2. CamcorderProfile.Quality: use an int rather than an enum
3. Add API on MediaRecorder to pass in a CamcorderProfile
4. CameraProfile.getImageEncodingQualityLevels @hide or make it consistent with CamcorderProfile
5. Remove a convenient method and instead let the (mms) app do that task

bug - 2553862

Change-Id: I759215c7892f772aeddf3651d17038489c6fbc50
2010-04-01 00:12:20 -07:00
Eric Laurent
110c432e6c am 3fe1708d: Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo
Merge commit '3fe1708d9d204fa63e8abe6e434378d89e963752' into froyo-plus-aosp

* commit '3fe1708d9d204fa63e8abe6e434378d89e963752':
  Fix isssue 2548710: Native AudioTrack resources never freed.
2010-03-31 23:37:02 -07:00
Eric Laurent
3fe1708d9d Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo 2010-03-31 23:33:52 -07:00
Dianne Hackborn
6ff57ee310 am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
Merge commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp

* commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982':
  Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
2010-03-31 23:18:32 -07:00