37883 Commits

Author SHA1 Message Date
Adam Powell
39fc4a3c7b Merge "Fix bug 3257463 - Yes, we SHOULD put the child in the recycler." 2010-12-10 13:30:37 -08:00
Adam Powell
22e92e5557 Fix bug 3257463 - Yes, we SHOULD put the child in the recycler.
This caused an issue where a LinearLayout measuring for the baseline
could cause the fake view for position 0 to be associated with a
different position in the recycler. It gets used later with the wrong
data; bad times.

Change-Id: If273894d46185a550f4efd9f11ef83e0113f0a3c
2010-12-10 13:20:32 -08:00
Gilles Debunne
07a11f4967 Selecting text from a punctuation sign selects previous word.
Cherry picked from a revert in https://android-git.corp.google.com/g/#change,82252

Change-Id: I141bbff2a0f9a8ab40f10c59fc1280b94b38e4b6
2010-12-10 13:14:20 -08:00
James Dong
845584e717 Fixed a failure from timelapse video recording because of accidental use of metadata buffers
bug - 3274317

Change-Id: I2c0e9fcd30c9141ce5a85e9d72cbd0baf561458b
2010-12-10 13:09:05 -08:00
Megha Joshi
29c696a675 am 87c03b58: (-s ours) am 7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread
* commit '87c03b58a9468caec18b161128ab14de90764fd4':
  Integrating webinar hosting with developer.android.com
2010-12-10 12:52:19 -08:00
Megha Joshi
87c03b58a9 am 7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread
* commit '7a1f15b1497ba2a79243448f6ac5617264f8c8d3':
  Integrating webinar hosting with developer.android.com
2010-12-10 12:33:59 -08:00
Romain Guy
a06cdd53d6 Merge "Correctly compare strings in UTF-8 instead of UTF-16 Bug #3272858" 2010-12-10 12:33:34 -08:00
Romain Guy
25dc3a7dba Correctly compare strings in UTF-8 instead of UTF-16
Bug #3272858

Change-Id: Idacd5d7c2c052b4834a8ddb5906ab32b3f548f73
2010-12-10 12:33:05 -08:00
Megha Joshi
7a1f15b149 Merge "Integrating webinar hosting with developer.android.com" into gingerbread 2010-12-10 12:30:35 -08:00
Xavier Ducrohet
3578e15333 Merge "LayoutLib: Adapt to new LayoutLib" 2010-12-10 12:14:04 -08:00
Eric Laurent
7c90d756ca Merge "Fix audio mode log." 2010-12-10 12:09:06 -08:00
Gilles Debunne
00cc777242 Merge "Added visual feedback to text correction." 2010-12-10 11:59:13 -08:00
Gilles Debunne
12d91ce8e3 Added visual feedback to text correction.
Change-Id: Id2b85b7b649a59a2666157c7ff540858b1ad403c
2010-12-10 11:51:30 -08:00
Eric Laurent
4f9e0f173e Fix audio mode log.
Since the new audio mode IN_COMMUNICATION was added, the audio mode log
was broken.

Change-Id: I4fdafc3b98a1b0ceb55058a9e47fed99b3dbe6ad
2010-12-10 11:46:12 -08:00
Dianne Hackborn
17d9550029 Turn off screenshot capturing for thumbnails.
May reduce occurance of graphics hangs as a temporary stop-gap until
the real problem is fixed.

Change-Id: I57f831944cc621bcb1d1d2051bb48f14e53879b1
2010-12-10 11:43:40 -08:00
Wink Saville
c0a46e7d64 Merge "Make activation rejection a non-permanent error." 2010-12-10 11:43:33 -08:00
Xavier Ducrohet
ffb42f6c50 LayoutLib: Adapt to new LayoutLib
API now uses ResourceValue instead of IResourceValue
Capabilities renamed Capability

Change-Id: Ia5d2b6c8d536e020a1f5496fb2285f67fc4346c4
2010-12-10 11:40:27 -08:00
Gilles Debunne
35e1ee0d39 Merge "New API in InputConnection to signal IME's text correction." 2010-12-10 11:34:22 -08:00
Gilles Debunne
cf9cf2f40e New API in InputConnection to signal IME's text correction.
Scafolding so that the IME team can start working on this feature.

The animation part in the TextView is missing.

Change-Id: I8225538564370fba1500e3539742a8ab79bdd199
2010-12-10 11:31:59 -08:00
Wink Saville
ffbce12056 Make activation rejection a non-permanent error.
Removed ACTIVATION_REJECT_GGSN and ACTIVATION_REJECT_UNSPECIFIED from
DataConnection#isPermanentFail() so they won't be detected as permanent.


bug: 3070773
Change-Id: I18d10bc44609e550d7932cd9600116f074bcb8dd
2010-12-10 11:09:47 -08:00
Eric Fischer
f1cbffa794 Merge "Import revised translations." 2010-12-10 10:55:54 -08:00
John Reck
134d323871 Merge "Fixes Android HTTP cache permissions" 2010-12-10 10:21:56 -08:00
John Reck
11c1a0be5d Fixes Android HTTP cache permissions
Bug: 3244281

Change-Id: I372475bc2d9bd2f2354ee603f77468df0cb043bf
2010-12-10 10:19:16 -08:00
Eric Fischer
70e81ba9ab am af22f4f1: (-s ours) am 767926bb: Import revised translations. DO NOT MERGE
* commit 'af22f4f16da1823a14f5f60012dffafb14b0d02b':
  Import revised translations.  DO NOT MERGE
2010-12-10 10:08:10 -08:00
Eric Fischer
af22f4f16d am 767926bb: Import revised translations. DO NOT MERGE
* commit '767926bbe90358bc3857f4b78f54c8cdacfb8773':
  Import revised translations.  DO NOT MERGE
2010-12-10 10:03:55 -08:00
Jean-Baptiste Queru
dfcaeb1677 am 81266d99: am a218e014: reconcile with open-source gingerbread
* commit '81266d9936605ab3fb6347d28cd7f4a81d6e23e0':
2010-12-10 08:54:14 -08:00
Jean-Baptiste Queru
81266d9936 am a218e014: reconcile with open-source gingerbread
* commit 'a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
2010-12-10 08:49:37 -08:00
Iain Merrick
a106993a51 Move useChromiumHttpStack() from CookieManager to JniUtil.
This is a generally useful method, not specific to CookieManager.
I want to use it to modify the behaviour of CacheManager when we're
using the Chrome HTTP stack.

Corresponding C++ changes in I78a92cb2

BUG=3270236

Change-Id: I56b0ddcaa93ef340f4ffc3578486c3c96316f2ec
2010-12-10 15:51:36 +00:00
James Dong
6370387680 Release a recording frame only if mCamera exists and is not cleared.
and also call mCamera->stopRecording() only after CameraSource releases all the
outstanding video frames sent from CameraSource to its clients (such as video encoder).

Change-Id: I7eeed4e2f388e77c28668d52c24b5330d3d9ebde
2010-12-10 07:34:08 -08:00
James Dong
acaab2d77c Merge "We requires camera hal's implementation should not track the ref count of any outstanding video frames and ignore releaseRecordingFrame() call after it receives disableMsgType(CAMERA_MSG_VIDEO_FRAME)." 2010-12-10 07:33:13 -08:00
James Dong
74920cb1a8 We requires camera hal's implementation should not track the ref count of any outstanding video frames and ignore
releaseRecordingFrame() call after it receives disableMsgType(CAMERA_MSG_VIDEO_FRAME).

Change-Id: I2ecb9b3b11dab6bf868ccf8effda1b8df5bcde3c
2010-12-10 07:19:13 -08:00
Ben Murdoch
a90b1424a5 Merge "Add a "Web Search" option to the WebView select text ActionBar" 2010-12-10 05:52:03 -08:00
Adam Powell
16bb80af66 Fix typo
Change-Id: I59e7009d054e376e4b48bcabb4a7343d0cab4bd1
2010-12-09 23:30:50 -08:00
Adam Powell
aed6c31576 Merge "Holo scrollbars and related tweaks." 2010-12-09 23:02:11 -08:00
Mike Lockwood
faa27f932e Merge "Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService" 2010-12-09 22:53:27 -08:00
Mike Lockwood
770126a678 Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService
In preparation for an upcoming change that will make UsbService into a real system service

Change-Id: Id85d624cfc6b10b49a08105cfaaacc667a492c12
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-09 22:52:05 -08:00
Adam Powell
20232d0f7c Holo scrollbars and related tweaks.
Added setting for placing vertical scrollbars on left or right.

Added setting for showing fast scroll persistently.

Fixed a bug where inset padding was miscalculated for horizontal scroll bars.

Fixed a bug where padded ListViews would draw fading edges incorrectly

Change-Id: I1f8499895272d42598b4b3fd3375301115def461
2010-12-09 22:47:20 -08:00
James Dong
337885be6e Merge "First step towards renabling Timelapse video recording" 2010-12-09 20:27:59 -08:00
Dianne Hackborn
a64f506941 Merge "Fix issue #3272051: Use backward transition when going backwards." 2010-12-09 19:25:17 -08:00
Dianne Hackborn
7da6ac33a9 Fix issue #3272051: Use backward transition when going backwards.
Also know as:

Issue #3272051 Contacts edit view: Tapping the in-app back button
results in a forward transition

Yeah more complexity in deciding which animation to use.

Also reduce complexity in deciding which app's animation set to use,
to balance things out (and make it have less stupid behavior).

Change-Id: I78c6c5c5249a96206f7e03ce587c1dcb9a7dc14f
2010-12-09 19:22:04 -08:00
Xia Wang
93ca011c60 Make Wi-Fi stress tests output log consistent.
Fix: record average at the beginning of each iteration

Change-Id: Ia129348dbf79ecf7efc7169b8bbfac3755ccce63
2010-12-09 19:07:59 -08:00
Jeff Brown
6f7f877cc0 Merge "Fix race condition in fallback key processing." 2010-12-09 18:54:35 -08:00
Mike Lockwood
b58d883683 Merge "MTP host: Handle receiving a response packet instead of data packet." 2010-12-09 18:42:13 -08:00
Mike Lockwood
bfd1d72a1a MTP host: Handle receiving a response packet instead of data packet.
This will happen if the device needs to report an error rather than returning the data.

Change-Id: I477512b3676c2f0518a85a4135832ed4475fbc2d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-09 18:34:18 -08:00
Jeff Brown
00045a7e6f Fix race condition in fallback key processing.
Need to ensure that the channel is still valid before proceeding.

Bug: 3271482
Change-Id: Ia6863cbedd9b53cbc5c9c8815e9ea90bef3d2218
2010-12-09 18:14:23 -08:00
Romain Guy
af636ebf5f Don't set the invisible flag when saving an empty layer.
Bug #3270371

Change-Id: I65e85671c2fb70d74553c91213e5e759e0ac64ee
2010-12-09 17:47:21 -08:00
Romain Guy
865cd3a20d Merge "Don't set the invisible flag when saving an empty layer. Bug #3270371" 2010-12-09 17:47:09 -08:00
John Wang
4ad628f8ad Merge "Add config_sms_capable." 2010-12-09 17:31:36 -08:00
Eric Fischer
a7a44f1894 Import revised translations.
Change-Id: I207197a388a65827b1c336cde6c5aa27c126e25c
2010-12-09 17:04:40 -08:00
Eric Fischer
767926bbe9 Import revised translations. DO NOT MERGE
Bug 3272618

Change-Id: I165a5964e62e3d3df59c26cf6595898ea3f84996
2010-12-09 16:54:24 -08:00