20324 Commits

Author SHA1 Message Date
Simon Wilson
df58a1bbf8 am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread
* commit '3d79f1ce84ee60dbb26468b9e5f75f4ccb5ed8aa':
  Attempt to reduce problems from issue #3183612
2011-03-02 18:13:49 -08:00
Simon Wilson
3d79f1ce84 am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread
* commit 'edc68a001cd94d2011029004cb27231432a18575':
  Attempt to reduce problems from issue #3183612
2011-03-02 18:10:33 -08:00
Gilles Debunne
5a39c95c00 Extra @Override removed in SpanStringBuilder
These were added in 99657 by using a misconfigured eclipse
save action that adds @Overirde to interfaces (Java 1.6 only).

Change-Id: I766bbde917b0bb063cb6d588ee276787e2f7db66
2011-03-02 18:06:13 -08:00
Simon Wilson
edc68a001c Merge "Attempt to reduce problems from issue #3183612" into gingerbread 2011-03-02 18:03:52 -08:00
Gilles Debunne
2ea39e2d1b Merge "Added documentation for SpannableStringBuilder.getTextRunCursor" 2011-03-02 17:56:01 -08:00
Gilles Debunne
f09d510cd1 Added documentation for SpannableStringBuilder.getTextRunCursor
Bug 3370244

Change-Id: I621a1599ff18da928044dd37a0d7cc861cc6f48f
2011-03-02 17:42:36 -08:00
Dianne Hackborn
cbf9cb35bb Merge "Fix issue #3400119: API to specify a black background behind a window transition" 2011-03-02 17:19:39 -08:00
Dianne Hackborn
de75cb4738 Fix issue #3400119: API to specify a black background behind a window transition
There is now an API, which is used for task switching.

Also improved how we handle rotation animation when we can't take a
screen shot, to cleanly revert to the old freeze behavior.  This removes
the need to special case the emulator.

Change-Id: I7227432a2309370437ec6ac78db02c6f1e7eedd5
2011-03-02 17:15:58 -08:00
Justin Ho
65c1ddc2bd Merge "Updated text select handles, paste dialogs, updated list section dividers (fixing previously incorrect asset.)" 2011-03-02 17:14:37 -08:00
Amith Yamasani
a3c9ad7170 Merge "Fix a race condition when entering and exiting a preference fragment quickly." 2011-03-02 17:13:46 -08:00
Justin Ho
579a884b01 Updated text select handles, paste dialogs, updated list section dividers (fixing previously incorrect asset.)
Change-Id: I0e747c18b87bfc64d87054c065f321ff872dbd8e
2011-03-02 17:04:00 -08:00
Amith Yamasani
81d860013c Fix a race condition when entering and exiting a preference fragment quickly.
Bug: 3413715

Fragment was going through STARTED/RESUMED/STARTED/CREATED very quickly and
bindPreferences() was a delayed call that happened after mView was nullified.
Removing the MSG_BIND_PREFERENCES when view is destroyed.

Change-Id: Iec43102c004a266c412b993f17e1a8c1699fb0b1
2011-03-02 16:11:31 -08:00
Jeff Brown
192f0b0608 Merge "Fade out the mouse pointer after inactivity or other events." 2011-03-02 15:54:42 -08:00
Shimeng (Simon) Wang
0a25836486 Merge "Adjust actual scale when zoom density changes." 2011-03-02 15:45:27 -08:00
Jeff Brown
05dc66ada6 Fade out the mouse pointer after inactivity or other events.
Fades out the mouse pointer:
- after 15 seconds of inactivity normally
- after 3 seconds of inactivity in lights out mode
- after a non-modifier key down
- after a touch down

Extended the native Looper to support enqueuing time delayed
messages.  This is used by the PointerController to control
pointer fade timing.

Change-Id: I87792fea7dbe2d9376c78cf354fe3189a484d9da
2011-03-02 15:37:57 -08:00
Svetoslav Ganov
7fb34b29c6 Merge "Force close in WebView." 2011-03-02 15:24:58 -08:00
Mike Lockwood
7866be2b76 am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
  DO NOT MERGE: Backport USB accessory support to gingerbread
2011-03-02 15:16:32 -08:00
Svetoslav Ganov
fa44314d3a Force close in WebView.
bug:3504589

WebView#removeJavascriptInterface was not performing check if
a mWebViewCore instance is present. Added such a check.

Change-Id: I7f6dfe51a08f23dddf2fc94df635fdfa68e9a7cf
2011-03-02 14:54:07 -08:00
Adam Powell
e43111fad3 Merge "Fix bug 3502257 - overscroll effect api" 2011-03-02 14:41:35 -08:00
Adam Powell
07d6f7bd75 Fix bug 3502257 - overscroll effect api
Change-Id: I3bf8bb653e96151c51fb94b4571a72b210615e62
2011-03-02 14:27:30 -08:00
Shimeng (Simon) Wang
9cedbcfdf5 Adjust actual scale when zoom density changes.
Also some fine tuning of zoom scales.
1. Since overview scale will be used to determine min zoom scale, its own
computation shall be free of min zoom scale.
2. make sure mMaxZoomScale is at lease mMinZoomScale.
3. Use default scale in case of non-overview mode, since it reflects the
current zoom density.

issue: 3494868
Change-Id: I4297878b820e437b706bb7e0f143336ff1b39f82
2011-03-02 14:26:36 -08:00
Eric Fischer
190586b723 Import revised translations. DO NOT MERGE
Change-Id: I2468a95f482f8839158250901d9b52ce9d8e41ad
2011-03-02 13:59:44 -08:00
Robert Greenwalt
7e48e76cab Merge "Start using NetworkUtils.numericToInetAddress." 2011-03-02 12:10:51 -08:00
Shimeng (Simon) Wang
25c0619b4b Merge "Revert "Remove the limitation that zoom can't go beyond overview scale."" 2011-03-02 11:53:17 -08:00
Christopher Tate
4418678c4c Merge "Fix binder proxy death notice tracking" 2011-03-02 11:48:37 -08:00
Shimeng (Simon) Wang
2c4ab3a510 Revert "Remove the limitation that zoom can't go beyond overview scale."
This reverts commit f1b391a1e3fc51f90f3afaae6623540cab326c8d.
2011-03-02 11:46:21 -08:00
Robert Greenwalt
e590373ea7 Start using NetworkUtils.numericToInetAddress.
Generates InetAddresses without risking an accidental dns lookup.  For use with supposedly
numeric-only ip address strings.

Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
2011-03-02 11:37:32 -08:00
Peter Visontay
bfcda39cad Fixed NPE in ActivityManager's launch count service.
Bug: 3497127
Change-Id: I38661fb0654e807f05cc57e43cff912de8d39096
2011-03-02 19:06:36 +00:00
Kenny Root
3dee21eb0f Merge "Switch to returnCode for IPackageDeleteObserver" 2011-03-02 08:50:42 -08:00
Leon Scroggins
6256ba9fa2 New assets for checkboxes and radios for WebView.
Bug:3009375

Needed by a change in external/webkit.

Change-Id: I403ae0960af0e3ce12bc5803e44790abb1f604be
2011-03-02 11:28:26 -05:00
Kristian Monsen
2b323c7200 Merge "Fix from post submit review" 2011-03-02 03:27:47 -08:00
Kristian Monsen
65662b6b90 Fix from post submit review
Change-Id: I10d96b254dcf3cb04f8d5cdf4bc527c84c362c1c
https://android-git.corp.google.com/g/#change,99052
2011-03-02 10:59:54 +00:00
Mike Lockwood
40bbf9295d DO NOT MERGE: Backport USB accessory support to gingerbread
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-01 23:09:12 -08:00
Vasu Nori
3cc66b30bf Merge "cosmetic fixes: removing unused members/imports" 2011-03-01 18:39:14 -08:00
Vasu Nori
d6c367f424 cosmetic fixes: removing unused members/imports
Change-Id: I307e5d5c7c1270d2590ba66f4c3d3b1a96646344
2011-03-01 18:37:52 -08:00
Vasu Nori
c3d979834e Merge "bug:3497143 don't print warning if it is a bug in platform - not in app." 2011-03-01 18:26:17 -08:00
Christopher Tate
bd8b6f25bb Fix binder proxy death notice tracking
There was an issue with stale recipient tracking when BinderProxy weak
references had been purged and a new proxy object allocated for a
still-live underlying IBinder.  The death recipient bookkeeping has
now been reworked so that it's fundmentally tied to the BinderProxy
instances, not maintained as global state, to prevent this sort of
confusion entirely.

Bug 3499939

Change-Id: I75c5216b6d53b90868ac969e32c9725201e51be3
2011-03-01 18:25:52 -08:00
Vasu Nori
8a358a7eed bug:3497143 don't print warning if it is a bug in platform - not in app.
fixing a couple of very confusing warnings..

Change-Id: I3c91fa53fc73a2fb4bee213e33af56c4bdb75fd8
2011-03-01 18:22:31 -08:00
Jason Chen
166055b529 am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb
* commit 'd616d5054f5e93f6a492896e7d8dd6d5b7eaa84b':
  Bugfixes in StaticLayout. DO NOT MERGE.
2011-03-01 17:57:56 -08:00
Jason Chen
d616d5054f Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb 2011-03-01 17:56:06 -08:00
Jason Chen
a688353928 am ef7aed89: Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb
* commit 'ef7aed89b610d0bd63ad7a1422b8db85730cb917':
  DO NOT MERGE Cherry-pick of cd59febcea2 from master
2011-03-01 17:54:26 -08:00
Jason Chen
ef7aed89b6 Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb 2011-03-01 17:50:51 -08:00
Gilles Debunne
22847209c4 Bugfixes in StaticLayout. DO NOT MERGE.
Bug 3422121

Cherry-picked from master's 95472.

With ellipsize, lines starting with a very long word that does not
fit inside the width were simply ignored. Cut the long word instead.

start - widthStart index offset shift in BiDi.

The original ellipsize-end patch that added '...' after the last
word on end-ellipsized lines has been punted in favor of a true
ellipsize support in I.

I believe the StaticLayout calculateEllipsise is a no-op since textwidth <= avail
by construction: fitWidth and okwidth are < outerWidth. The only exception is the
paraEnd != here case in generate (when not a single character fits in width).
This case is exercised by StaticLayoutTest in cts (width of 8 pixels) and revealed
an offset error in widstart.

All in all, it looks like this code was probably never really tested. I tried some
typical text configuration to make sure these changes improved the situation.

Change-Id: I6c2cb26436a21f0f89078c275a89e891f0f23b92
2011-03-01 17:41:23 -08:00
Dianne Hackborn
e0edf4c1a2 Merge "Fix issue #3405957 com.android.settings: java.lang.NullPointerException..." 2011-03-01 17:36:25 -08:00
Dianne Hackborn
bfe2e3f9da Fix issue #3405957 com.android.settings: java.lang.NullPointerException...
...at android.app.DialogFragment.dismissInternal(DialogFragment.java:264)

Don't allow a DialogFragment to be dismissed twice.

Change-Id: Id2e9e3be1046b0d7862492c57c36001d8fd44a69
2011-03-01 17:20:43 -08:00
Dianne Hackborn
94b072b6f4 Merge "Fix issue #3411615: Crash when getting dialog layout inflator." 2011-03-01 17:18:10 -08:00
Gilles Debunne
4797f020cd DO NOT MERGE Cherry-pick of cd59febcea2 from master
AIOOB exception fix in TabWidget

Bug http://code.google.com/p/android/issues/detail?id=15005

The problem was not specific to the legacy theme. The code that first
measure the tab's width with no contraint was incorrectly using the
mImposedTabsWidth array which could not have the right size if a
child was added.

The first measure after a child is added should indeed crash. Could
be investigated. This fix is sure anyway.

Change-Id: If5015aaa2d5574939fd5d6c6362ed6db94d35d4a
2011-03-01 16:46:36 -08:00
Romain Guy
ffe2c7a071 Merge "Don't account for scrollX/Y when drawing a display list in a layer." 2011-03-01 15:54:57 -08:00
Romain Guy
a7dabcd3df Don't account for scrollX/Y when drawing a display list in a layer.
Change-Id: I73bdcdab3e547d00ba2853aed550e65d5f8c6fcd
2011-03-01 15:48:57 -08:00
Adam Powell
549d2b15b5 Merge "Fix bug 3501411 - ListView should ignore "up" events outside of its view" 2011-03-01 15:41:58 -08:00