12627 Commits

Author SHA1 Message Date
Dmitri Plotnikov
13e0357ec1 Fixing the SDK build
Change-Id: I84cee32bf6d7395e7d6a366fb0b582b73637d18c
2010-08-19 16:31:29 -07:00
David Brown
5aaeaffdce Merge "Move the "voice_capable" resource into the framework." 2010-08-18 14:32:36 -07:00
Konstantin Lopyrev
917031361c am 28bd3a54: am f2af87b3: Merge "Making sure the draw time is measured." into gingerbread
Merge commit '28bd3a54ec192ed9259cf88873e387129103258e'

* commit '28bd3a54ec192ed9259cf88873e387129103258e':
  Making sure the draw time is measured.
2010-08-18 14:22:25 -07:00
Wu-cheng Li
24844c9a30 am a2527055: am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Merge commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9'

* commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9':
  Document that autoFocus must be called in auto and macro mode.
2010-08-18 14:22:02 -07:00
Steve Howard
1944cca612 am 0899e8bc: am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Merge commit '0899e8bc9dc44249d6be016bed71a9ecee56f132'

* commit '0899e8bc9dc44249d6be016bed71a9ecee56f132':
  Fix up handling of null fields in DownloadManager.
2010-08-18 14:21:44 -07:00
Jeff Brown
671cc0ec30 am 8fd80e92: am 72ce4235: Merge "Fix possible race conditions during channel unregistration." into gingerbread
Merge commit '8fd80e924a2f40f6a785f834914f8a6f18a3aa9d'

* commit '8fd80e924a2f40f6a785f834914f8a6f18a3aa9d':
  Fix possible race conditions during channel unregistration.
2010-08-18 14:20:24 -07:00
David Brown
ae3efa53a9 Move the "voice_capable" resource into the framework.
There's currently a config.xml param in the phone app saying whether the
current device is "voice capable", which is used to determine (among other
things) whether the OTASP call should run in interactive mode.

But both Contacts and Settings are about to need this flag too, so it
really belongs in the framework instead.  As of this change it's now
"com.android.internal.R.bool.voice_capable".

Also add a corresponding TelephonyManager call so that unbundled and 3rd
party apps can access it too.

Change-Id: Ie9a8803295bf97eb32154291aac8fce1e21c7b25
2010-08-18 14:12:30 -07:00
Konstantin Lopyrev
28bd3a54ec am f2af87b3: Merge "Making sure the draw time is measured." into gingerbread
Merge commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16' into gingerbread-plus-aosp

* commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16':
  Making sure the draw time is measured.
2010-08-18 13:39:29 -07:00
Wu-cheng Li
a2527055f8 am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Merge commit 'c86960236d5b2095c87bf46de2400a905acabee2' into gingerbread-plus-aosp

* commit 'c86960236d5b2095c87bf46de2400a905acabee2':
  Document that autoFocus must be called in auto and macro mode.
2010-08-18 13:39:01 -07:00
Steve Howard
0899e8bc9d am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Merge commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8' into gingerbread-plus-aosp

* commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8':
  Fix up handling of null fields in DownloadManager.
2010-08-18 13:38:42 -07:00
Jeff Brown
8fd80e924a am 72ce4235: Merge "Fix possible race conditions during channel unregistration." into gingerbread
Merge commit '72ce42352c1c229e05d910b4176f3cddb608e814' into gingerbread-plus-aosp

* commit '72ce42352c1c229e05d910b4176f3cddb608e814':
  Fix possible race conditions during channel unregistration.
2010-08-18 13:36:08 -07:00
Daisuke Miyakawa
a7bb3ba54a am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread
Merge commit 'f996ed9f2e4a992e5d884077a15dcc23a8d90c44' into gingerbread-plus-aosp

* commit 'f996ed9f2e4a992e5d884077a15dcc23a8d90c44':
  Make vCard importer/exporter aware of multi-byte parameters.
2010-08-18 13:35:47 -07:00
Jean-Baptiste Queru
3719f8568e DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp
Change-Id: I29703133654f0f80a4425914d290e9dc50cbc3cc
2010-08-18 13:20:28 -07:00
Jeff Hamilton
5d595f6d83 Merge "Switch the methods in Browser over to the new provider." 2010-08-18 12:57:10 -07:00
Shimeng (Simon) Wang
c1cba781d3 Use fixed viewpport for tablet device.
This makes the zoom animation much more smooth.  With previous dynamic
viewport, the animation jumps because of viewport adjustment and big
screen.

Also the viewport width is changed from 800 to 1040 to better suit
the tablet device.  It's the middle point of 1280 and 800.

The text reflow re-alignment for non-double-tap zoom is disabled for
tablet, since most of the time the reflow has no effect.

issue: 2919307
Change-Id: I74493df6408291c24ef8511512d7ed0b81bf507a
2010-08-18 12:45:12 -07:00
Leon Scroggins
2aed776142 Change focusController only when WebView gains/loses focus.
Bug: 2582455

A corresponding webkit change eliminates the rest of the calls
to change the active and focused state of the focus controller.

Change-Id: I18868b7480ba5daae71375d109d5a721ecf22b4d
2010-08-18 14:55:18 -04:00
Romain Guy
756879836b Merge "Layers were using an extra Snapshot causing extra clipping." 2010-08-18 11:51:25 -07:00
Romain Guy
2542d19974 Layers were using an extra Snapshot causing extra clipping.
Bug #2919310

Change-Id: I72ccd44bba7a3f3db72f581aa96198b6226e4478
2010-08-18 11:47:12 -07:00
Konstantin Lopyrev
f2af87b39b Merge "Making sure the draw time is measured." into gingerbread 2010-08-18 11:43:21 -07:00
Romain Guy
4fbcdbbb7b Merge "Resize default xlarge wallpaper." 2010-08-18 11:40:22 -07:00
Romain Guy
a8031c68c8 Resize default xlarge wallpaper.
Change-Id: Iecab1b2a99d6f7ca1c85f6727fcb2ef21842b1f6
2010-08-18 11:39:52 -07:00
Konstantin Lopyrev
bef337f516 Making sure the draw time is measured.
Change-Id: I6bf8094aee03793f125008386c4fea730e95d07a
2010-08-18 11:31:27 -07:00
Jean-Baptiste Queru
f939518510 Revert "- updates NetUtils to use new libnetutils headers"
This reverts commit 9bf3bb21c097cc96f30d9bf3ec7dea62a74a738b.
2010-08-18 11:16:42 -07:00
Dmitri Plotnikov
e50ed08afc Unhiding Contact Directory APIs
These APIs need to be public to allow integration
with Focus, which is unbundled.

The design document can be found here: http://goto/android-gal-integration

Change-Id: I14e749e485e301e8af5a657cc798e581dec21394
2010-08-18 11:12:35 -07:00
Amith Yamasani
59f3a757b5 Merge "Make getListView() public and hidden, as it is needed for WifiSettings." 2010-08-18 10:42:39 -07:00
Wu-cheng Li
c86960236d Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread 2010-08-18 10:19:45 -07:00
Jeff Hamilton
6f42edc207 Switch the methods in Browser over to the new provider.
Change-Id: I070db67989cc01b50ef0f64cb8f8652b9a1a587d
2010-08-18 11:12:05 -05:00
Steve Howard
baf3869b88 Merge "Fix up handling of null fields in DownloadManager." into gingerbread 2010-08-18 09:03:34 -07:00
Patrick Scott
243efd2c57 Merge "Use a static variable and methods for the current WebView." 2010-08-18 08:11:38 -07:00
Patrick Scott
8a5d335a55 Use a static variable and methods for the current WebView.
sJavaBridge may not exist by the time onWindowFocusChanged is called.
To avoid an NPE, just static methods that modify a global field.
JWebCoreJavaBridge is a global object anyway so using a static field
will be fine.  To avoid any garbage collection issues, store the
WebView in a WeakReference.

Bug: 2894682
Change-Id: I73de9237ddbbdc55841a9b2639437e26856439c8
2010-08-18 11:00:42 -04:00
Bjorn Bringert
a006b47298 New API and implementation of DB and memory-backed FDs
This depends on a kernel patch that implements read(2)
in the ashmem driver.

Bug http://b/issue?id=2595601

Change-Id: Ie3b10aa471aada21812b35e63954c1b2f0a7b042
2010-08-18 15:39:52 +01:00
satok
7eb84256e5 Enhancement of method.xml for Fast IME switching
- (Public API) Add public attrs: imeSubtypeExtraValue, imeSubtypeLanguage, imeSubtypeMode
-- (Public API) Add InputMethodSubtype class
-- (Public API) Add getSubtypes to InputMethodInfo
- Add parser for the enhanced method.xml

Change-Id: Ie7965fd29fd9615ef9c9418075c9f5f1c3365eb6
2010-08-18 19:19:00 +09:00
Adam Powell
2b6a68580b Merge "Fix bug 2927837 - PopupWindows don't account for xlarge status bar height" 2010-08-17 21:26:32 -07:00
Adam Powell
a7287f4d19 Fix bug 2927837 - PopupWindows don't account for xlarge status bar height
Add framework dimension resource screen_margin_bottom. This describes
the bottom margin formed by permanent screen decorations. In xlarge
configs this is equal to the height of the permanent system bar.

PopupWindows now size and position themselves with respect to
screen_margin_bottom.

Change-Id: I8960059adcf09605abf26c228bf877f5632fd11e
2010-08-17 21:17:04 -07:00
Dianne Hackborn
291905e34a Maybe fix #2925641: calling onCreateOptionsMenu before attached activity
Also add some APIs to PreferenceActivity.

Change-Id: I85894a3eb9cd3e5adb78b82e85454c0d74773178
2010-08-17 18:53:19 -07:00
Romain Guy
4ae784f126 Merge "Fix save()/restore() issues in the OpenGL renderer." 2010-08-17 18:40:50 -07:00
Romain Guy
8fb954263d Fix save()/restore() issues in the OpenGL renderer.
The save stack now behaves exactly like in Skia.

Change-Id: If7e642f41f2c8f693f6e8c26cba81507d466562e
2010-08-17 18:40:21 -07:00
Winson Chung
cdff2f2424 Merge "Fixing link in RemoteViewsFactory comment." 2010-08-17 18:17:47 -07:00
Winson Chung
6eceb00db9 Fixing link in RemoteViewsFactory comment.
Change-Id: Ibfb61eedbceb5721e3894074cc4b5597b12691f7
2010-08-17 18:16:47 -07:00
Adam Powell
e67a9dc83d Clean up some options menu/action bar menu handling for Dialogs.
Add Dialog#invalidateOptionsMenu so that dialogs hosting action bars
have a way to request a refresh of menu content.

Change-Id: I73aa22c2df1c5e60b94035e30af548f87073dbb9
2010-08-17 18:06:15 -07:00
Adam Cohen
b04f7ad90b -> Added 3D rotation to the StackView transition
-> Fixed a bug with multiple animations occuring at the same time
-> Added looping paramater to AdapterViewAnimator
-> Added restoration of state to AdapterViewAnimator
-> Fixed a flicker in the default AdapterViewAnimator transition
   (could be seen in AdapterViewFlipper)
-> Fixed a bug where touch events of StackView weren't be
   propagated to the proper child

Change-Id: I270280cabc42ad77d28e3e7d7d80aa4c17548cab
2010-08-17 17:29:36 -07:00
Eric Fischer
acf6178265 Merge "Import revised translations." 2010-08-17 17:23:28 -07:00
Jeff Brown
72ce42352c Merge "Fix possible race conditions during channel unregistration." into gingerbread 2010-08-17 17:05:38 -07:00
Jeff Brown
2cbecea4c9 Fix possible race conditions during channel unregistration.
Previously, the input dispatcher assumed that the input channel's
receive pipe file descriptor was a sufficiently unique identifier for
looking up input channels in its various tables.  However, it can happen
that an input channel is disposed and then a new input channel is
immediately created that reuses the same file descriptor.  Ordinarily
this is not a problem, however there is a small opportunity for a race
to arise in InputQueue.

When InputQueue receives an input event from the dispatcher, it
generates a finishedToken that encodes the channel's receive pipe fd,
and a sequence number.  The finishedToken is used by the ViewRoot
as a handle for the event so that it can tell the InputQueue when
the event has finished being processed.

Here is the race:

1. InputQueue receives an input event, assigns a new finishedToken.
2. ViewRoot begins processing the input event.
3. During processing, ViewRoot unregisters the InputChannel.
4. A new InputChannel is created and is registered with the Input Queue.
   This InputChannel happens to have the same receive pipe fd as
   the one previously registered.
5. ViewRoot tells the InputQueue that it has finished processing the
   input event, passing along the original finishedToken.
6. InputQueue throws an exception because the finishedToken's receive
   pipe fd is registered but the sequence number is incorrect so it
   assumes that the client has called finish spuriously.

The fix is to include a unique connection id within the finishedToken so
that the InputQueue can accurately confirm that the token belongs to
the currently registered InputChannel rather than to an old one that
happened to have the same receive pipe fd.  When it notices this, it
ignores the spurious finish.

I've also made a couple of other small changes to avoid similar races
elsewhere.

This patch set also includes a fix to synthesize a finished signal
when the input channel is unregistered on the client side to
help keep the server and client in sync.

Bug: 2834068
Change-Id: I1de34a36249ab74c359c2c67a57e333543400f7b
2010-08-17 17:03:42 -07:00
Eric Fischer
ba4048c028 Import revised translations.
Change-Id: I03d83a241843f1fe88471425e4a7f7e6f33fee16
2010-08-17 16:50:06 -07:00
Amith Yamasani
9ae5473eae Make getListView() public and hidden, as it is needed for WifiSettings. 2010-08-17 16:49:58 -07:00
Chet Haase
5c76498572 Implement reversing functionality for Animator
Change-Id: I5cf32363a363c17a1d5c5dd0c602b06dc9ebc785
2010-08-17 16:42:29 -07:00
Daisuke Miyakawa
f996ed9f2e Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread 2010-08-17 16:42:06 -07:00
Daisuke Miyakawa
b7688558cc Make vCard importer/exporter aware of multi-byte parameters.
Bug: 2922186
Change-Id: Ic877940242d87ef918bf8d4dac601d37b296259b
2010-08-17 16:40:47 -07:00
Andrew Stadler
468c3230da Fix two bugs in PreferenceActivity headers
* Make Header fields public so activities can write them
* Recycle views properly
* Also made the HeaderAdapter and HeaderViewHolder static inner classes
  for a little extra efficiency.

Change-Id: If0a9276e4609e2e8568c7c5a6963f3ed3e25565f
2010-08-17 16:16:42 -07:00