46101 Commits

Author SHA1 Message Date
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
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
Jim Miller
c13c8d82ae Merge "Fix 3463772: Bring back alarm icon on LockScreen" 2011-03-01 18:17:06 -08:00
Jim Miller
599351e93d Fix 3463772: Bring back alarm icon on LockScreen
Change-Id: Icdf948c774d280e22da84e9241b345244a56befd
2011-03-01 18:14:48 -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
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
Eric Laurent
2704f2b005 Merge "Fix issue 3499926." 2011-03-01 17:08:02 -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
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
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
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
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
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
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
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
Santosh Madhava
2380aa08c2 Merge "Fix for issue 3431967: Memory leak from video editor engine" 2011-03-01 12:04:12 -08:00
Mike Lockwood
6ebc6bde63 Merge "UsbDeviceSettingsManager: don't write settings file when not necessary" 2011-03-01 12:00:09 -08:00
Mike Lockwood
b4948d4d3f Merge "Fix UsbDeviceSettingsManager locking." 2011-03-01 11:59:32 -08:00
Mike Lockwood
04e1a9620f Merge "Move USB framework support from android.hardware to android.hardware.usb package" 2011-03-01 11:58:22 -08:00
Eric Laurent
42b3de5833 Merge "Fix issue 3479042." 2011-03-01 11:46:15 -08:00
Romain Guy
321dce646d Avoid UTF-8 conversions and string copies whenever possible.
Change-Id: Ie4584417bbb7247e6c567fbfdb819529e548bb8f
2011-03-01 11:45:33 -08:00
Santosh Madhava
71771b3b1b Fix for issue 3431967: Memory leak from video editor engine
Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
2011-03-01 11:44:50 -08:00
Jamie Gennis
7fc013753b Merge "Stagefright: Query buffer usage from the component." 2011-03-01 11:41:29 -08:00
Irfan Sheriff
2f6409686f Merge "Using AsyncChannel for wifi connectivity" 2011-03-01 11:32:24 -08:00
Fred Quintana
f9f240e3ad Fix a deadlock in AccountManagerService cause by different
paths of code getting the mCacheLock and DB locks in different
orders.

The philosophy I followed for this was to ensure that the
DatabaseHelper is only ever accessed from within a
synchronized(mCacheLock) block. I also renamed a bunch of
methods to make it easier to know if a given method should
be called from within this synchronized block.

Bug: 3404506
Change-Id: Ia48f95e77b77647d0717f70f1d8364da3719cc13
2011-03-01 11:23:19 -08:00