16198 Commits

Author SHA1 Message Date
Eric Fischer
d6a46103bf Merge "Rename Indonesian and Hebrew translations to match Locale.java conventions" 2010-12-02 14:29:03 -08:00
Fabrice Di Meglio
eca53640a8 Add better SQL exception handling to the Sync framework (see bug #3202693)
- do the reply.writeNoException() only if there are NO exceptions
- before, the code could actually generate an exception when asking for the count or the index,
and then the exception could not be unmaarshalled because we previously calling reply.writeNoException()

Change-Id: I241120878c3fc10fea5fbaeb74f9124b1413a3d4
2010-12-02 14:28:32 -08:00
Russell Brenner
fdc676f6d6 Merge "Merge WebKit at r72274: Update WebKit revision number" 2010-12-02 14:11:41 -08:00
Russell Brenner
a9de7616c3 Merge WebKit at r72274: Update WebKit revision number
Change-Id: Ia0b6e349b06f5cdbf81cfa4eb2cbbc2a55c41ee3
2010-12-02 14:07:32 -08:00
Eric Fischer
d09a98173b Rename Indonesian and Hebrew translations to match Locale.java conventions
Change-Id: Icf4f1896d13a4b6bf86503b16bde189f1834fdcc
2010-12-02 14:05:29 -08:00
Adam Powell
049dd3d4a4 Fix bug 3248786 - silly monkeys.
Change-Id: I41306cae06a7b4fd3852e0760ae668c8d6eacc5d
2010-12-02 13:45:30 -08:00
Xia Wang
5343f5a84e am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
* commit '3591bebd5957a8547fc54659179a19440636e7f9':
  Restore Wi-Fi configuration after the test. DO NOT MERGE
2010-12-02 13:44:54 -08:00
Xia Wang
3591bebd59 Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread 2010-12-02 13:40:23 -08:00
Steve Block
544295eebc Update WebView.addJavascriptInterface() to ignore null instances
Bug: 3247571
Change-Id: If6a108fe926e45dc3e298f197f6534c575c560e2
2010-12-02 18:40:06 +00:00
Gilles Debunne
f4dceb1946 Customized text selection action mode.
Refactored to use a custom Callback instance instead.

This instance can be shared by different TextView, which no longer have to
be overloaded.

Change-Id: I4749905d8e2057dab2b3ded62bd7c388d13d4e57
2010-12-02 10:24:03 -08:00
Wink Saville
d66c63e56e Merge "Remove the need for a token parameter from AsyncChannel." 2010-12-02 09:51:05 -08:00
Mike Lockwood
1474c7a2b6 PTP: Add android.provider.Ptp to the public API
This will allow 3rd party apps to access files on digital cameras via the PTP protocol

BUG: 3210830

Change-Id: I06dbf2842a7eea2e0749e2124bb7b7a65e8901c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-02 12:13:37 -05:00
Jeff Hamilton
609b3e429a Merge remote branch 'ohd/gingerbread' into merge 2010-12-02 09:41:16 -06:00
Bjorn Bringert
212799338d Only decrement mRemaining once in read().
In the old code AssetFileDescriptor.AutoCloseInputStream.read()
called super.read(), which calls read(byte[] buffer, int offset, int count),
which decrements mRemaining. Then read() decremented mRemaining again
after super.read() returned.

I'm extending the CTS tests for AssetFileDescriptor.AutoCloseInputStream
to cover this.

Bug: 3240844
Change-Id: I70b945abc773d3ce5c1317dad23a0d797b31f111
2010-12-02 11:36:47 +00:00
Romain Guy
eeb55e673f Don't reset ListView when changing the divider drawable.
Bug #3245172

Change-Id: I36e20bc63e503ffff9c2354e7cc48e5574bb0c4a
2010-12-02 00:12:46 -08:00
Romain Guy
7d69594580 Skip DIRTY_OPAQUE optimizations when ViewRoot changes the dirty region.
Bug #3159481

Change-Id: I97d6517f4648b3efe8b13a277e0374844a4d8455
2010-12-02 00:11:12 -08:00
Michael Jurka
23fe0ce427 Merge "Revert "Re-add performance optimization in View"" 2010-12-02 00:09:28 -08:00
Michael Jurka
67f23ba649 Revert "Re-add performance optimization in View"
Found reproducible cases of Launcher freezing up due to this change

This reverts commit 62490bd358cd001e00cb643cf3879d736c448788.

Change-Id: I1b10e05ee9f0c43566b53c7a11e61fc168d17a75
2010-12-02 00:06:26 -08:00
Adam Powell
fcca00accb Update themes; dialogs, metrics
Add divider attributes to LinearLayout, plus styles for borderless
buttons. Update text field assets.

Change-Id: I673acab1692cc028a0327e8c154069253a4d52e8
2010-12-01 23:23:21 -08:00
Wink Saville
cfce303cbd Remove the need for a token parameter from AsyncChannel.
By returning the channel object it self it is unnecessary
to have a token. Also, no current code needed it, if its
needed in the future it can be added back.

Change-Id: Ie1d2a1e885f9cd74e95663711ccefb760811bf16
2010-12-01 23:20:25 -08:00
Eric Fischer
dcafdb2e9b Merge "Import revised translations." 2010-12-01 17:00:16 -08:00
Brian Carlstrom
db1a3ba219 Merge "Resurrect SamplingProfilerIntegration" 2010-12-01 16:23:58 -08:00
Dianne Hackborn
30c9bd8955 Implement issue #3189564: New API to create an activity.
Change-Id: I7aef83324d653130eb3b2a148ba089d7347e6ba6
2010-12-01 16:13:44 -08:00
Freeman Ng
58f49cb7f2 Merge "change SHUTDOWN permission to signatureOrSystem so setup wizard can start ACTION_REQUEST_SHUTDOWN bug: 3201638" 2010-12-01 15:44:42 -08:00
Brian Carlstrom
def41ec2e8 Resurrect SamplingProfilerIntegration
1.) Change from samples per second (persist.sys.profiler_hz) to
    interval between samples (persist.sys.profiler_ms) to match
    underlying SamplingProfiler API.  This allows samples to be taken
    less often than a second, which allows lower overhead for always
    on profiling.

2.) Add persist.sys.profiler_depth to control the number of frames
    kept. Currently defaults to 4 which is the default hprof depth,
    but often 12 is necessary even in benchmarks to get a good idea
    where time is being spent.

3.) Moved SNAPSHOT_DIR creation to initialization time instead of
    checking it on every sample.

4.) Used ThreadFactory to provide human readable name to writeSnapshot
    Executor thread.

5.) Fixed bug where writeZygoteSnapshot was calling wrong variant of
    writeSnapshot causing profiling to prevent zygote startup. Renamed
    underling private writeSnapshot to writeSnapshotFile to try to
    prevent future confusion.

Change-Id: Ifcfc343816b19f13a6eef2cbf25cde334d8adc3b
2010-12-01 15:40:38 -08:00
James Dong
dd0b16c268 Add two methods to Camera.java
o getSupportedVideoSizes() allows us to retrieve the list of the supported
  video sizes from the camera

o getPreferredPreviewSizeForVideoRecording() allows us to retrieve the
  preferred/recommended preview size for camcorder applications

bug - 3237021

Change-Id: I52fc9938d389bb411406320b0309775b6f44f4dc
2010-12-01 15:38:06 -08:00
Xia Wang
fddbe98cca Restore Wi-Fi configuration after the test. DO NOT MERGE
- save Wi-Fi configuration and restore it after the test, other tests
  may need data connection
- Fix issue: reset dhcp after parsing a static IP setting.

bug: 3240713

Change-Id: I2158cab6fb6751414893b6a950d9e5bb20021645
2010-12-01 15:18:31 -08:00
Freeman Ng
addfc766d5 change SHUTDOWN permission to signatureOrSystem
so setup wizard can start ACTION_REQUEST_SHUTDOWN
bug: 3201638

Change-Id: I0d422667fa27df5df2fadbf27d4e3677a70db8f1
2010-12-01 15:17:35 -08:00
Eric Fischer
198aa52429 Import revised translations.
Change-Id: Ie519c5155103e4f7715025d6e224b65f5fef8bb1
2010-12-01 15:15:29 -08:00
Christopher Tate
407b4e91fe API CHANGE: drags can now carry an originator-only object payload
When calling startDrag(), the app can now supply an Object to be passed
along in every DragEvent that the app winds up receiving itself.  This
object is *not* passed to any other applications; it's strictly app-
local.  The purpose is to allow state tracking/management to be done
directly through the drag mechanism rather than requiring out-of-band
code.

An example of the utility here might be TextEdit widgets.  A drag that
starts in one TextEdit but ends in a different one should be treated as
a copy/paste operation, where the originating TextEdit is not altered.
However, a drag that starts and ends in the *same* TextEdit is a 'move'
operation within that TextEdit; the text is removed from its original
position and inserted at the drop point.  To support this easily, the
drag/drop code in TextEdit can now pass a pointer to the originating
view as the local state object.  Then, the drop recipient could tell
whether the drag started within the same TextEdit without needing to
implement any other out-of-band state tracking.

This CL (and its accompanying CLs in a few other packages where the
startDrag() API is being used) adds the new local-state parameter to
the API, but does not actually change the behavior of any existing
clients.

Change-Id: Icba73b2ab4a650b7a94485a19633065b0ef9058c
2010-12-01 14:45:06 -08:00
Kenny Root
4da12f07b5 am 1de6ca69: am 938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
* commit '1de6ca69cc541ccdd651071c8bd5629af4e09664':
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-01 14:23:19 -08:00
Kenny Root
1de6ca69cc am 938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
* commit '938d097263416ad416ee995e62dab559ea50bf0d':
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-01 14:20:49 -08:00
Kenny Root
938d097263 Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread 2010-12-01 14:18:23 -08:00
Teng-Hui Zhu
a7f76874f5 Use the globalLayout to notify the GlViewport change
Given the fact that our optimization is enforced to avoid sending
the onLayout message down to webView, utilizing the globalLayoutChange
message seems like the best solution here.

http://b/issue?id=3103077

Change-Id: I9a2d5576454641802019a5eeb64908026b40dd9b
2010-12-01 14:11:10 -08:00
Teng-Hui Zhu
e6fb0f1d7c Properly set the viewport for WebView when using GL
This is the first step, get the calculation right.
We still need to get the right message handling to get
the correct animation in Gmail .

http://b/issue?id=3103077

Change-Id: I3ed186b62ddb285e92a71d3ba5c02d4965068282
2010-12-01 14:11:10 -08:00
Gilles Debunne
2825366c56 A double tap starts selection when done on text only.
Change-Id: Id758645d1ebf482a09e35b158e8665d1153db498
2010-12-01 13:53:27 -08:00
Jesse Wilson
4f915bdf06 Merge "Add a test to demonstrate parsing of trailing URI parameters." 2010-12-01 13:43:33 -08:00
Leon Scroggins
2ac445cbb7 Do not remove the embedded title bar when starting Find.
Bug:2927138
Change-Id: I97adb4431aedca172a5951d727ad559de5101924
2010-12-01 16:34:00 -05:00
Gilles Debunne
2226a19f70 Refactor onDrop in TextView
Change-Id: Ied80565852a452c15c7b7a66cbb05965bead04cd
2010-12-01 13:28:49 -08:00
Adam Powell
8515ee846b Fix bug 3240444 - add OnMenuVisibilityListener for action bar.
Fix bug 3180015 - leaking window handles on configuration change for
action bar dropdown menus

Rename ActionBar.NavigationCallback to something more consistent with
the rest of the API.

Change-Id: Ic1fb4c07484c57a72649b30e27d220b18cda6cdf
2010-12-01 13:03:44 -08:00
Jesse Wilson
47413708eb Add a test to demonstrate parsing of trailing URI parameters.
Change-Id: I1fde21381cf74b5e4847bb2c2a9ef52f8ac6a2bb
http://b/3124097
2010-12-01 11:48:51 -08:00
Gilles Debunne
fff4ab09b6 Refactored OverScroller
Restored the interpolator and a constructor with 4 parameters.

New spline coefficients, spline computation moved to MagneticOverScroller, which has been
renamed SplineOverScroller.

Change-Id: If1ab2653bb998600e9c5d6f46dfd6cd30fa44efc
2010-12-01 11:41:42 -08:00
Kenny Root
1de2eac9d0 Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Be compatible with the old DownloadProvider behavior of being able to
operate on content URIs returned from .insert()

Bug: 3242328
Change-Id: I7dad15ac0fefa867c3c8a33a579fc9899ac80262
2010-12-01 11:37:53 -08:00
Chet Haase
2e1f5b0de3 Merge "Add methods to AnimatorSet that take collections" 2010-12-01 11:15:39 -08:00
Chet Haase
37a7bec599 Add methods to AnimatorSet that take collections
Change-Id: I5664bee6d27b32a70ca7d335e7fbe0af39a240bd
2010-12-01 11:05:59 -08:00
Dianne Hackborn
0f761d6b8f Implement issue #3201795: Improve transition when keyboard comes up
ViewRoot now does a fade animation between a snapshot of the previous
layout to the new one when its content rect changes.

Also tweaked some things in the window manager to fix problems in
deciding when to animate the movement of a window and when not to.

Change-Id: I9b4b3bd53c8258bd39a2f2fc315e77cfc56a409c
2010-12-01 11:00:42 -08:00
Gilles Debunne
0eb704ca7a Tap inside text selection dismisses selection.
Change-Id: I8ccc952940d3f1b3a52d506f750019a892380f40
2010-12-01 10:33:26 -08:00
Patrick Scott
4b90378af0 Allow one finger to scroll layers.
TODO: Add velocity.
Change-Id: I548ef6332b260a2aecc39422012523cb6f8e2523
2010-12-01 12:42:30 -05:00
Mathias Agopian
33962f8c7d am be0ece6f: am 186b68b7: Merge "allow rotation-vector to have 4 components" into gingerbread
* commit 'be0ece6f855ee2ab52309b6633def90ddeab38ee':
  allow rotation-vector to have 4 components
2010-12-01 09:21:04 -08:00
Brad Fitzpatrick
7e5cd79683 am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
* commit '981a72a1506f7e6e42747b9aa0be2001795c6619':
  [don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 08:50:00 -08:00