drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,085 Commits 1 Branch 0 Tags
Commit Graph

46085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Leon Scroggins
6e0e0ec980 Fix password field drawing. 
Bug:3499916

Change-Id: Idb10e9780e6a0cfecd6228de0fbfd4a1035ab61e
 2011-03-01 14:17:30 -05:00
Eric Fischer
9d30f5bce1 Merge "Import revised translations." 2011-03-01 11:11:24 -08:00
Mike Lockwood
31ad11eb44 UsbDeviceSettingsManager: don't write settings file when not necessary 
Change-Id: I48772f71822e3489f9e6c640985055569a656124
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-01 11:03:19 -08:00
Eric Fischer
5db857209f Import revised translations. 
Change-Id: Ibd5a50501b157fccde300eb6822a7627c91e6640
 2011-03-01 10:59:51 -08:00
Mike Lockwood
8924a7a3db am 5d019f0e: (-s ours) am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread 
* commit '5d019f0e6d57cdd633aa976a8a0f221941afd343':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
 2011-03-01 10:59:00 -08:00
Mike Lockwood
ca8ab8a0cb am 3fa12d45: (-s ours) am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread 
* commit '3fa12d459d16fb1d3d06b6c68b201340c9d3afcd':
  DO NOT MERGE: Clean up USB notifications:
 2011-03-01 10:58:56 -08:00
Mike Lockwood
4ff963328d am 91dceb81: (-s ours) am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread 
* commit '91dceb8143c9dab6b9b0ad38b5a3d7bb0586c677':
  DO NOT MERGE UsbManager: squashed commit of:
 2011-03-01 10:58:52 -08:00
Mike Lockwood
3d37ca42fe am 8697f397: (-s ours) am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 
* commit '8697f397e29cdfb90f84fab584eff9edc2b0dc6f':
  Give system server permission to access USB. DO NOT MERGE
 2011-03-01 10:58:49 -08:00
Xavier Ducrohet
52c98b41d6 am 2d5ed079: (-s ours) am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 
* commit '2d5ed07940bc1966d4b55999634f05515e7fe197':
  Merge 1911a6f7 into gingerbread. do not merge.
 2011-03-01 10:58:45 -08:00
Gilles Debunne
0a1b818b8c AbsListView notifies scroll events to the ViewTreeObserver. 
ViewTreeObserver OnScrollChangedListener will then get notified.

The scroll values are not specified, since they are passed to the
base View.onScrollChanged method that simply sets the flags.

No need to throw these from a Runnable (in case this happens during
a relayout) since the listeners will be notified later from ViewRoot.draw().

Calling View.onScrollChanged in invokeOnItemScrollListener for normal scroll and
in onOverScrolled to handle mScroller animation.

Change-Id: Ib41434e5cd82e5a45ca6653db576746e89ef072d
 2011-03-01 10:58:22 -08:00
Wink Saville
8366b23317 am 23fe0059: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb 
* commit '23fe005900aab2955052e0c9dc36ca05ea351a1a':
  Fixing the write of BackgroundData setting, DO NOT MERGE.
 2011-03-01 10:58:05 -08:00
Gilles Debunne
5bf7658cb8 Merge "Removed ViewTreeObserver null checks" 2011-03-01 10:50:00 -08:00
Gilles Debunne
0357e5b2fe Merge "Scrollable tabs are correctly displayed." 2011-03-01 10:49:23 -08:00
Adam Powell
857447f1f9 Merge "Fix a bug where the lazy-initialized ActionBar object was being too lazy." 2011-03-01 10:46:42 -08:00
Adam Powell
763cbb134f Fix a bug where the lazy-initialized ActionBar object was being too lazy. 
Change-Id: I80dc06deffd1df8cc8ae96fd878d66a101a17086
 2011-03-01 10:45:34 -08:00
Eric Rowe
99cf1e0ca3 Merge "Add test cases for AudioManager SCO methods." 2011-03-01 10:31:26 -08:00