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

17971 Commits

Author SHA1 Message Date
Gilles Debunne
0a4db3c527 Pixel were missing on the last line of text when using MaxLines. 
Bug 3295544

Only the last line of text includes the bottomPadding (extra line
spacing below the characters' descent. When The text is clipped using
maxLines, the desired height correctly added this value, but getLineTop
and getLineDescent are also used when the layout is drawn.

The fix is to make the layout aware of its clipping so that these
values are correctly updated.

Change-Id: I703656cf45022d34a90f55f0ed8fc5e4b30f80b1
 2011-01-30 18:23:13 -08:00
Dianne Hackborn
260c3c77d9 Fix issue #3381489: IllegalStateException: attempt to re-open... 
...an already-closed object: android.database.sqlite.SQLiteQuery

It turns out there is a state we are missing -- the loader is
still needed, but in the inactive list.  In this case the loader
needs to continue holding on to its current data, and not deliver
any new data (which would result in it releasing its old data).

This introduces the new state to Loader, and uses it in
AsyncTaskLoader so all subclasses of that should get the new
correct behavior.

A further improvement would be to unregister CursorLoader's
content listener when going in to this state, but that can
wait for later.

Change-Id: I6d30173b94f8e30b5be31d018accd328cc3388ec
 2011-01-30 17:58:49 -08:00
John Reck
13934c2d71 Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb 2011-01-30 16:55:23 -08:00
John Reck
636ce004df Prevent SET_SCROLL_OFFSET spam from clogging tubes 
Bug: 3393571
 Limit the event queue to a single pending SET_SCROLL_OFFSET. The
 problem on slashdot.org was that the event thread was being flooded
 with SET_SCROLL_OFFSET messages faster than it could process them,
 causing the handler to get jammed up.

Change-Id: Ia4a90a030959d0b3769067791089cdb261ae403a
 2011-01-30 16:23:09 -08:00
Adam Powell
c9cb308371 Merge "Fix bug 3405899 - android.view.WindowManager$BadTokenException" into honeycomb 2011-01-30 16:12:56 -08:00
Dianne Hackborn
54ad361194 Merge "Fix issue #3404571: Commit final APIs" into honeycomb 2011-01-30 16:01:36 -08:00
Joe Onorato
4de68baed4 Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb 2011-01-30 16:00:52 -08:00
Gilles Debunne
236b987214 Merge "Auto-clearing setError popup" into honeycomb 2011-01-30 15:49:38 -08:00
Adam Powell
65a1de963a Fix bug 3405899 - android.view.WindowManager$BadTokenException 
Clear any pending runnables involved with TextViews when cursor
controllers are released

Change-Id: I96898fcc237f20d0b0f2351181244cb171fa2083
 2011-01-30 15:47:29 -08:00
Joe Onorato
ac0ee89bd9 Check for the STATUS_BAR permission for the system UI properties. 
If the app doesn't have that permission, just mask out the bits.
Also makes the systemUiVisibility field visible in hierarchyviewer.

Change-Id: Ic3d3a3aed96b5c6448832755b4b2e6175117e5be
 2011-01-30 15:38:30 -08:00
Dianne Hackborn
3b024a6d28 Fix issue #3404571: Commit final APIs 
Change-Id: I7f01f8df9cfb82a9bb987e3df7c8eaa1c5aab81a
 2011-01-30 14:26:31 -08:00
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge 
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
 2011-01-30 12:40:38 -08:00
Gilles Debunne
12ab64593f Auto-clearing setError popup 
Bug 3403325

Error popup has to be dismissed whether or not the key was handled.

Change-Id: Ib6326b27fc521398f3cb0c546d29a7de9df18375
 2011-01-30 12:11:24 -08:00
Jeff Brown
3c89f6d1bd Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb 2011-01-30 12:07:49 -08:00
Joe Malin
51990f9b0c Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb 2011-01-30 09:45:59 -08:00
Ken Wakasa
8710e76a89 Follow up change to I741642ac 
Fix wrong constant.

bug: 3404788
Change-Id: Ic5f849e6640a78a70951cf819d7e8ce53a9c2585
 2011-01-30 11:02:09 +09:00
Jean-Baptiste Queru
8f4a04f04c am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:32:04 -08:00
Jean-Baptiste Queru
7ea919c44b Merge 6b739dc7 from gingerbread 
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
 2011-01-29 12:59:20 -08:00
Jean-Baptiste Queru
1358b6a4fb Tweak to make merges easier 
Bug: 3364311

Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
 2011-01-29 12:54:09 -08:00
Jason parks
a2e765ef1a Merge "Update the encryption password when the device password is changed." into honeycomb 2011-01-29 12:02:19 -08:00
Jean-Baptiste Queru
0044b4ad6a Merge d350dc04 from gingerbread 
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
 2011-01-29 10:57:48 -08:00
Nick Pelly
4226be3f04 am 21d0a173: Fix build - javadoc. 
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
 2011-01-29 10:40:07 -08:00
Jean-Baptiste Queru
0440cc1fb7 Merge eab0e97b from gingerbread 
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
 2011-01-29 10:38:09 -08:00
Dianne Hackborn
1ac4f38dfa am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread 
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
  Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
 2011-01-29 09:54:53 -08:00
Kenny Root
c68a657f12 am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
 2011-01-29 09:48:07 -08:00
Jean-Baptiste Queru
962d556a12 Merge f126ad3b from gingerbread 
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
 2011-01-29 09:37:44 -08:00
Nick Pelly
1ac6d08a05 am b134223f: Make Mifare Classic increment/decrement operands little endian 
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
  Make Mifare Classic increment/decrement operands little endian
 2011-01-29 09:31:56 -08:00
Arnaud Ferir
c5e35fd246 am 5e81a6e2: Fix trace mismatch. 
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.
 2011-01-29 07:30:07 -08:00
Sylvain Fonteneau
addd46c658 am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel. 
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
 2011-01-29 07:29:56 -08:00
Jean-Baptiste Queru
86e1c5b9f6 Merge c896d85c from gingerbread 
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
 2011-01-29 07:27:06 -08:00
Jean-Baptiste Queru
ac983353e6 Merge da01b4ab from gingerbread 
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
 2011-01-29 07:17:22 -08:00
Jeff Hamilton
6d904e7039 am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread 
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
  Allow null filters for foreground dispatch to act as catch all.
 2011-01-29 07:09:21 -08:00
Jim Miller
4485edce05 am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM. 
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
  Fix 3379239: Catch exceptions from workaround for OOM.
 2011-01-29 07:08:58 -08:00
Robert Greenwalt
6b739dc729 Merge "Add some network types that OEM's are asking for." into gingerbread 2011-01-29 06:38:35 -08:00
Justin Ho
9b1df1646f Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb 2011-01-28 22:51:51 -08:00
Justin Ho
35326b876e Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style 
Change-Id: Ib78eb3f75b7734c0244fbc9ac58c52d2ffbbdb27
 2011-01-28 22:49:43 -08:00
Jeff Brown
2992ea782f Add "Use physical keyboard" option to system bar IME button. 
Bug: 3391067
Change-Id: I136087ca4f726d0068d5983d7d3686787ba60c55
 2011-01-28 22:06:36 -08:00
Joe Onorato
a0f2cdb507 Merge "999" into honeycomb 2011-01-28 18:47:57 -08:00
Joe Onorato
c6925ca684 999 
Bug: 3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
 2011-01-28 18:46:20 -08:00
Jeff Hamilton
df5d015ae2 resolved conflicts for merge of dc54a8c7 to honeycomb-merge 
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
 2011-01-28 20:41:42 -06:00
Joe Onorato
430dde3ef3 Merge "Don't force all views to be asking for lights out just because somebody did." into honeycomb 2011-01-28 16:38:01 -08:00
Joe Onorato
957a189bf2 Don't force all views to be asking for lights out just because somebody did. 
Bug: 3396308
Bug: 3395422
Change-Id: Ic97a689bda12d3b53a6ecace504d411f2beb87d5
 2011-01-28 16:36:16 -08:00
Dianne Hackborn
6ec44395f3 Merge "Fix issue #3403539: WordPress crashes on Honeycomb" into honeycomb 2011-01-28 16:34:02 -08:00
Chet Haase
691d43c35f Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb 2011-01-28 16:19:32 -08:00
Chet Haase
0dfc398424 Fixed LayoutTransition bug moving multiple views 
The problem was that there can be >1 animation spawned for each
view in a container, if there are multiple events that trigger
a transition. These animations would potentially clobber object
layout values, causing problems as successive animations tried to use those
clobbered values to set up their own animation values.

The fix is to track the created animations and cancel them as future
animations on those same objects get created. This mechanism used to
be in the code (the bug came about when that mechanism went away), but
was removed because of memory leaks of never removing animations that
were set up but never started. The new approach also caches pending
animations, but runs a second aniamtor to delete the entries in that
collection just in case.

Change-Id: If60c7d188712334dea69d0794dc6b4ce29ca6c09
 2011-01-28 15:54:37 -08:00
Eric Fischer
0982dc6488 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-28 15:09:16 -08:00
Justin Ho
20af1c57de Merge "Correct font size for notifications & control panel." into honeycomb 2011-01-28 15:02:55 -08:00
Eric Fischer
0e77f6dfcb Import revised translations. DO NOT MERGE 
Change-Id: I385b9dbf5908ad7030263bc586fba2ebdfe7cf85
 2011-01-28 14:54:54 -08:00
Brian Muramatsu
9eaefb8213 Merge "Fix TextUtils#commaEllipsize" into honeycomb 2011-01-28 14:51:10 -08:00
Robert Greenwalt
e12aec941d Add some network types that OEM's are asking for. 
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values.  Will mark them unhidden in a future sdk release.

bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
 2011-01-28 14:48:37 -08:00