46228 Commits

Author SHA1 Message Date
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
Jim Miller
04fe9f4825 Merge "Fix 3482763: Minor layout tweaks and new asset for recents" 2011-03-01 17:50:41 -08:00
Daniel Sandler
d7ba12135b Merge "Make with the clicky. (Status bar buttons now play FX.)" 2011-03-01 17:49:18 -08:00
Jim Miller
9c1785820b Fix 3482763: Minor layout tweaks and new asset for recents
Fixed in this change:
 - ListView overscroll drawable was partially off screen.
 - Selected item was not fading when unselected

Change-Id: Ifba86eede591c4d4f984a7966b933a77799f66f9
2011-03-01 17:45:11 -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
James Dong
de1d7b4be6 Merge "Get rid of redundant media profiles" 2011-03-01 17:11:26 -08:00
Dianne Hackborn
b66ad57ca0 Fix issue #3387676 com.android.browser: java.lang.NullPointerException...
Unable to destroy activity {com.android.browser/com.android.browser.BrowserActivity}:
java.lang.NullPointerException at android.app.ActivityThread.performDestroyActivity(ActivityThread.java:2809)

Add a bunch of guards to not call on to the window callback after the
window is destroyed.

Change-Id: I66ca0705f421bafdfe953d03654c8f78d9e68249
2011-03-01 17:11:08 -08:00
Eric Laurent
2704f2b005 Merge "Fix issue 3499926." 2011-03-01 17:08:02 -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
Jim Miller
b43838fd7a Merge "Fix 3500730: Prevent NPE cause by clicking on footer view" 2011-03-01 16:27:40 -08:00
Jim Miller
b5a2b29a64 Fix 3500730: Prevent NPE cause by clicking on footer view
This fixes a crash caused by clicking in the footer view
by making it not selectable.

Also, don't hide home and recents button, per request from UX.

Change-Id: Ie3348c8f5d699841aa76fd7abe889b2b329c7b0b
2011-03-01 16:14:59 -08:00
James Dong
797e4f1dce Get rid of redundant media profiles
bug - 3330679

Change-Id: Idc55aea32746c0c57552c5e15a289681421aa859
2011-03-01 15:58:59 -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
Amith Yamasani
0e99d3bfab am df33b8c5: Merge "Check for NTP time as soon as WIFI is connected." into honeycomb
* commit 'df33b8c51d431a7c0f7a89ead8dfacdd3660ff48':
  Check for NTP time as soon as WIFI is connected.
2011-03-01 15:50:41 -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
Amith Yamasani
df33b8c51d Merge "Check for NTP time as soon as WIFI is connected." into honeycomb 2011-03-01 15:47: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
Adam Powell
498e43dd8e Fix bug 3501411 - ListView should ignore "up" events outside of its view
Do not dispatch item clicks if the up event occurs completely outside
of list bounds.

Change-Id: I2bc38040bcc98944e1449affcdbd75e0194637cf
2011-03-01 15:39:53 -08:00
Adam Cohen
e0d23e6fdc Merge "Adding mouse scroll wheel support to StackView" 2011-03-01 15:27:19 -08:00
Dianne Hackborn
606ecf3e9f Merge "Fix issue #3495749: Crash on choosing to open the downloaded images" 2011-03-01 15:26:44 -08:00
John Reck
7a3a51d0f5 Merge "Send correct cookies for HTML5 video when incognito" 2011-03-01 15:07:39 -08:00
Dianne Hackborn
25193d330e Fix issue #3411615: Crash when getting dialog layout inflator.
Well, I'm not sure it is right for onCreateDialog() to return a null
dialog, but if it does, let's not crash here.

Change-Id: I5ff49b9b3c326d9005f70a01435c01bfc7307343
2011-03-01 15:01:30 -08:00
Romain Guy
d643bb56fd Correctly mark layers dirty when drawing WebView.
Change-Id: I7ae0c3cfa0916d8fbeaf01e8da127c621a06a0f4
2011-03-01 14:55:21 -08:00
Romain Guy
e6c524022d Merge "Correctly mark layers dirty when drawing WebView." 2011-03-01 14:53:48 -08:00
Adam Cohen
a8a7c92b36 Adding mouse scroll wheel support to StackView
Change-Id: I8ae5039606b3080059cea579547f6c61586641e3
2011-03-01 14:48:53 -08:00
Dianne Hackborn
ce418e661a Fix issue #3495749: Crash on choosing to open the downloaded images
This is due to the window doing a relayout after its activity is
stopped, at which point it may need to interact with the adapter
to load data.

The fix here is to tell ViewRoot about an activity being stopped
and, if in this state, hold off on doing any new measurements and
layouts of the hierarchy until it is no longer stopped.

In this case the relayout was happening due to the cursor
being deactivated, with causes the adapter to invalidate
its data.  Because this is now in a dialog window, this
allows the window to actually be resized smaller (unlike when
in a full screen activity), and boom.

Change-Id: I26442b4679819b4a4e6bc56289afd3445526750b
2011-03-01 14:45:28 -08:00
Eric Fischer
f6d1d87df5 am 86b7a597: Import revised translations. DO NOT MERGE
* commit '86b7a59726010e0952b0ede4fd40d933aeb83384':
  Import revised translations.  DO NOT MERGE
2011-03-01 14:41:39 -08:00
Jamie Gennis
5a6f9faf5d Merge "Add the MIN_UNDEQUEUED_BUFFERS query to ANW." 2011-03-01 14:38:20 -08:00
Dianne Hackborn
fd938f323c Merge "Fix Issue 14340: Sticky Service killed with onDestroy not called, not restarted." 2011-03-01 14:36:12 -08:00
John Reck
09407b4810 Send correct cookies for HTML5 video when incognito
Bug: 3489551

Change-Id: Ic35ec725e72e97830afff2fb0392b2300d8c45f6
2011-03-01 14:35:03 -08:00
Romain Guy
6910f429cd Merge "Avoid UTF-8 conversions and string copies whenever possible." 2011-03-01 14:28:13 -08:00
Eric Fischer
86b7a59726 Import revised translations. DO NOT MERGE
Change-Id: I6f5f40b8dbbe271ccbb5493b3a6d7d1f08d1bdb3
2011-03-01 14:17:03 -08:00
Mathias Agopian
9f81547fc5 Add support for up to 32 buffers per Surface
Bug: 3488016

Change-Id: Ie5536ad77d42a4d0e8270e0fd87ecb73471bcbbc
2011-03-01 14:09:06 -08:00
Mathias Agopian
525af5d5b0 reformat file, which contained tabs instead of spaces
Change-Id: If26ef8be8c80a7894d256572cb3b9e60742dce57
2011-03-01 14:04:28 -08:00
Gilles Debunne
91b52b1895 Merge "AbsListView notifies scroll events to the ViewTreeObserver." 2011-03-01 13:55:16 -08:00
Daniel Sandler
aa051d66af Make with the clicky. (Status bar buttons now play FX.)
Now sending accessibility events and playing click noises:
 - Home
 - Back
 - Notification icons (if you tap; tap-and-hold/scrub is
   silent)
 - the clock area

I also added touch slop to the main nav buttons (should have
been there all along).

Bug: 3422943
Change-Id: Ib5ee1d3a7c79e60e05377715092cde3f7678ddcf
2011-03-01 16:36:21 -05:00
Costin Manolache
c039bb5d1e am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
* commit '66d46ac61478c967ed45bd1c27b0436654d54299':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-01 13:28:03 -08:00
Kristian Monsen
e4dcf0948a Merge "Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 video in incognito" 2011-03-01 13:12:24 -08:00
Derek Sollenberger
3545c72ce1 Merge "Don't update webkit at every stage of a zoom animation." 2011-03-01 12:58:31 -08:00
Derek Sollenberger
ac382cf581 Don't update webkit at every stage of a zoom animation.
This CL defers updating webkit until a zoom animation has completed.

bug: 3451126
Change-Id: I75a90f307a3493363811ba67ec4e55bfec9c0702
2011-03-01 15:50:27 -05:00
Amith Yamasani
8d394fa899 Check for NTP time as soon as WIFI is connected.
Listen for connectivity changes. If WIFI is connected, check if
we have recently checked for NTP time. If we haven't yet checked the
time or it has been long enough (a day), then connect to the NTP server
and get the latest time. Update the time if it is significantly out of sync.

This doesn't poll the NTP server every time there is connectivity, only
if it hasn't been checked since boot or has been a day.

This fixes the problem that during SetupWizard, we try to contact the NTP
server before there is connectivity and fail. Now, as soon as the user
chooses a WiFi network to connect to, it will update the time before
getting to the Date/Time step. Then as soon as the user corrects the TZ,
the date/time should be correct.

Bug: 3491920
Change-Id: I62664156616510b67ecd6a1c24dd838b98d5204f
2011-03-01 12:41:04 -08:00
Eric Laurent
9b44c662d5 Fix issue 3499926.
Make sure that NumberEffectsEnabled is decremented at the same time as
SamplesToExitCountBb reaches 0 in Effect_process(). Not doing so
causes NumberEffectsEnabled not being decremented if Effect_setEnabled()
is called after SamplesToExitCountBb reaches 0 and before next Effect_process() is called.

Change-Id: Id827a301f93a5a09ecd9995a0c7d731ef526711a
2011-03-01 12:35:18 -08:00
Fred Quintana
dfa28c3449 Merge "Fix a deadlock in AccountManagerService cause by different paths of code getting the mCacheLock and DB locks in different orders." 2011-03-01 12:30:06 -08:00
Costin Manolache
66d46ac614 am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-01 12:29:40 -08:00
Dianne Hackborn
3a28f22eb6 Fix Issue 14340: Sticky Service killed with onDestroy not called, not restarted.
Change-Id: I2804c49ad5669ca89744c6d92ead0c7d21ee31d5
http://code.google.com/p/android/issues/detail?id=14340
2011-03-01 12:25:54 -08:00
Kristian Monsen
469aebbbd9 Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 video in incognito
Adding private mode parameter for some cookie operations.

Depends on this change in webkit:
https://android-git.corp.google.com/g/#change,99051

Change-Id: I304de625632c3d659bf0d7a6b6a6e2bec985ecb6
2011-03-01 20:25:36 +00:00