Chris Tate
3f3e53bc30
Merge "Be sure to back up / restore some new settings"
2010-02-25 17:20:50 -08:00
Christopher Tate
ae06ed9738
Fix the build
...
Change-Id: I41616afc75a3366ea7e9e79ac7ea4c46d1863d83
2010-02-25 17:13:28 -08:00
Marc Blank
50d89f9616
Merge "Define the new lastSyncedAttendeeStatus column"
2010-02-25 16:59:54 -08:00
Christopher Tate
14c2d79028
Be sure to back up / restore some new settings
...
Added in this CL:
Power sounds enabled
Dock sound enabled
Lock/unlock sounds enabled
Auto-restore app data on install
Change-Id: Ie1c3215e926282e7cac5b82cd6196636049f7f85
2010-02-25 16:53:23 -08:00
Chris Tate
1fc2ff97ed
Merge "Start respecting the auto-restore-at-install setting"
2010-02-25 16:52:08 -08:00
Marc Blank
64a556d755
Define the new lastSyncedAttendeeStatus column
...
Change-Id: I567ca24770fb401ed5a2bdfce5709e77b6fb4202
2010-02-25 16:51:12 -08:00
Carl Shapiro
82fe564267
Comment out the finalize() methods defined on the Activity,
...
ContextImpl, View and ViewRoot classes. This allows instances of
subclasses to be collected without the additional latency of
finalization.
2010-02-25 16:42:28 -08:00
Adam Powell
4bb79db462
Merge "HorizontalScrollView multitouch scroll and only grip on content AbsListView multitouch scroll and only grip on content"
2010-02-25 16:29:42 -08:00
Andreas Huber
7bc58b07e2
Merge "Support vendor MPEG4 test content with apparently malformed chunks in them."
2010-02-25 16:25:43 -08:00
Andreas Huber
dfb8eee5bd
Support vendor MPEG4 test content with apparently malformed chunks in them.
...
related-to-bug: 2472211
2010-02-25 16:24:32 -08:00
Dmitri Plotnikov
da2572ad75
Renaming contact search snippet fields.
...
Change-Id: If27271665aedbb125072bbcd0cf375846c38cc9f
2010-02-25 16:09:35 -08:00
Adam Powell
4cd47702f0
HorizontalScrollView multitouch scroll and only grip on content
...
AbsListView multitouch scroll and only grip on content
2010-02-25 16:05:26 -08:00
Kenny Root
8221e323e8
Merge "Remove misleading method comment on TextView#setHint"
2010-02-25 15:54:19 -08:00
Kenny Root
2a4f254d53
Remove misleading method comment on TextView#setHint
...
Comment incorrectly specified that the setHint(...) methods were
deprecated and suggested instead using different methods that did not
exist.
Change-Id: I5e7a1570beb8f1cd807853c6d9de8072afa5123e
2010-02-25 15:46:55 -08:00
Christopher Tate
f087272d56
Start respecting the auto-restore-at-install setting
...
Change-Id: I420ff6b4ba72f87bee56f45d8906f086f7a2b114
2010-02-25 15:28:38 -08:00
James Dong
5be65ab5b9
Merge "Add some space and total memory amount to the memory dump from the media server process."
2010-02-25 15:14:40 -08:00
James Dong
b93003649d
Merge "Image encoding settings java API through xml configuration file"
2010-02-25 15:11:29 -08:00
The Android Open Source Project
a4b1fe6b26
am fc7028f1: merge from open-source master
...
Merge commit 'fc7028f1c68dcc8d59c8e4daf4a8917a3d9a7558'
* commit 'fc7028f1c68dcc8d59c8e4daf4a8917a3d9a7558':
Move LocationTracker test app from vendor/google to frameworks/base/tests
2010-02-25 15:08:03 -08:00
The Android Open Source Project
fc7028f1c6
merge from open-source master
2010-02-25 14:54:51 -08:00
Romain Guy
ac68d81ce1
Merge "Prevent ProgressBar from updating itself when hidden. Bug #2470737 "
2010-02-25 14:33:32 -08:00
Romain Guy
a05e8a5869
Prevent ProgressBar from updating itself when hidden.
...
Bug #2470737
2010-02-25 14:32:39 -08:00
Suchi Amalapurapu
aaec779513
Pick up default install location
2010-02-25 14:03:34 -08:00
Gilles Debunne
aa635db5c6
Merge "New test on ContextMenuInfo packed positions."
2010-02-25 13:49:53 -08:00
Gilles Debunne
192ab90388
New test on ContextMenuInfo packed positions.
...
With and without headers.
Non regression test for bug
http://b/issue?id=1778239
Change-Id: I0235528ac6f8394292bac35f2350f3d5be1e4df7
2010-02-25 13:46:50 -08:00
Steve Howard
d82968d8d8
Merge "Improve accelerometer-based orientation sensing."
2010-02-25 13:42:43 -08:00
Eric Fischer
277903f8d8
Merge "Add support for accessing native bidi implementation via jni."
2010-02-25 12:18:55 -08:00
Robert Greenwalt
7964d1f7ac
Merge "Fix no-mobile-data after wifi."
2010-02-25 12:18:26 -08:00
Cary Clark
018ff891a0
don't draw layers with history
...
The history picture and the layers drawn may be out of sync,
so for now, don't draw the layers when the history picture is
drawn.
Also, remove native class check from drawExtras() since it
is already checked by the caller.
fixes http://b/2457350
fixes http://b/2453780
2010-02-25 15:08:07 -05:00
Robert Greenwalt
3542959972
Fix no-mobile-data after wifi.
...
Missed a case - if you disabled mobile data and then cycled wifi, 3g would
be turned back on.
bug:2251458
2010-02-25 12:04:29 -08:00
Oscar Montemayor
70e1a184df
Merge "Replacing hard-coded mount point for ASEC with a getenv() call."
2010-02-25 11:43:22 -08:00
Dianne Hackborn
2269d1572e
Re-arrange android-common so framework no longer links with it.
...
This is the framework part, moving classes around so the framework
no longer needs to link to android-common. Makes some APIs public,
others that didn't need to be public are private in the framework,
some small things are copied.
2010-02-25 11:39:33 -08:00
Amith Yamasani
e46145f7c1
Merge "Configuration param to indicate if sd card is behind the battery."
2010-02-25 11:13:21 -08:00
Dianne Hackborn
a89a3a94b8
Merge "Init car mode when phone is booted in a dock."
2010-02-25 11:10:55 -08:00
Romain Guy
d0c6182cb9
Merge "Correctly handle negative margins in horizontal linear layouts."
2010-02-25 11:02:24 -08:00
Romain Guy
c352090c49
Correctly handle negative margins in horizontal linear layouts.
...
When LinearLayout is measured in EXACTLY mode, we handle the negative margins
a bit differently. This is to support the use case of the current tab design.
2010-02-25 11:01:01 -08:00
Fred Quintana
ee74858f1f
make the SyncStateContentProviderHelper.update() method return an indication if the row to update still exists
2010-02-25 10:59:52 -08:00
Elliott Hughes
d2f246162e
Merge "Remove incorrect/misleading irrelevancies from example code."
2010-02-25 10:32:41 -08:00
Amith Yamasani
1d620c67e2
Merge "Fix for voice search crash in maps and youtube. Bug 2453182"
2010-02-25 10:27:33 -08:00
Amith Yamasani
d368572f8e
Fix for voice search crash in maps and youtube. Bug 2453182
...
No need to nullify the context variable.
Also fix 2463128 : No voice icon when text is present in text field
2010-02-25 10:25:45 -08:00
Mike LeBeau
2299a553bc
Merge "Add the API constants to support providing hint strings in the response to RecognizerIntent.ACTION_GET_LANGUAGE_DETAILS."
2010-02-25 10:16:14 -08:00
James Dong
3d23a61588
Add some space and total memory amount to the memory dump from the media server process.
2010-02-25 10:06:32 -08:00
Leon Scroggins
0aa341f0d1
When opening the IME or sending a key to a non-cursored textfield, set the default selection.
...
Fix for http://b/issue?id=2431351
2010-02-25 12:49:29 -05:00
Jean-Michel Trivi
e379710cc5
Merge "Fix bug 2452941 Add a flag to maintain the intended direct playback of TTS data independently from the associated AudioTrack state. Only start the track when it's been stopped but is supposed to be playing."
2010-02-25 08:47:40 -08:00
Mike LeBeau
2f5fc454c8
Add the API constants to support providing hint strings in the response to
...
RecognizerIntent.ACTION_GET_LANGUAGE_DETAILS.
This will use the new support for ArrayList<CharSequence> bundles added in
http://b/2468093 . This and the corresponding VoiceSearch CL should not be
submitted until that is.
2010-02-25 07:19:55 -08:00
Cary Clark
2ec30697c6
refactor drawing to support layers
...
Drawing elements that appear atop or below layers need to be
drawn both in the proper order and with the correct canvas to
respect clipping and the matrix.
The logic of what to draw is still in WebView.java, but the
actual drawing calls are now triggered inside the layer code.
This still draws layers incorrectly after drawing the history;
will fix this in a future CL.
Move drawing to WebView.cpp.
Use inverseScale to simplify viewPort metrics.
Remove root layer; let WebView.cpp handle it exclusively.
Requires companion fix in external/webkit.
http://b/2457316
http://b/2454127
http://b/2454149
2010-02-25 08:38:48 -05:00
Patrick Scott
6a4472f4d5
Allow cookies with no name.
...
Cookies like "foo; path=/;" should be evaluated to have just a name. This makes
it easier to compare cookies when looking for duplicates.
Bug: 2333747
2010-02-25 08:08:32 -05:00
Steve Block
c8f22299b1
Merge "Add HTML5 layout tests that currently fail to the DumpRenderTree skipped list"
2010-02-25 03:17:36 -08:00
Bjorn Bringert
8354fa65eb
Make setBackgroundResource() remotable
...
Change-Id: Iad9c2bdf743a81a085024cad9dc340ae8a983f34
2010-02-25 10:46:03 +00:00
Tobias Haamel
a712dcec1c
Init car mode when phone is booted in a dock.
...
When the device is booted in a car dock the car mode needs to be set
as well, so that the status bar notification shows up and the system
is initialized the same way as if the phone is placed into a car dock
when it's booted already.
2010-02-25 11:14:21 +01:00
Eric Laurent
bda568fb80
Merge "Fix issue 2327064: Music played via line out is interrupted due to the phone call audio on BT hs."
2010-02-25 00:14:47 -08:00