Jean-Baptiste Queru
5131763c58
am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs"
...
* commit '27badee3f567015183ab584fae1cbd32a996e78d':
stubs
2011-01-31 14:00:52 -08:00
Jamie Gennis
cf67530392
am 8df2c424: Merge "Fix a multithreading bug in libagl\'s EGL." into honeycomb
...
* commit '8df2c42413cfdde1c4290b4797a09c4bafb6c3bc':
Fix a multithreading bug in libagl's EGL.
2011-01-31 13:56:28 -08:00
Dianne Hackborn
723453a7a7
am e9da0c1d: Merge "Fix issue #3408542 : "resizeable" attribute required to get out of compat mode" into honeycomb
...
* commit 'e9da0c1de179e3cdb2d3709bde2b5cb6eb192230':
Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
2011-01-31 13:56:24 -08:00
Gilles Debunne
ed6f13c4bd
am c1eb127f: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
...
* commit 'c1eb127f4e19c1f86e4b18c2c1daebe2404eeb93':
Tabs are resized to make sure they fit in their parent.
2011-01-31 13:56:21 -08:00
Jamie Gennis
8df2c42413
Merge "Fix a multithreading bug in libagl's EGL." into honeycomb
2011-01-31 13:38:27 -08:00
Dianne Hackborn
e9da0c1de1
Merge "Fix issue #3408542 : "resizeable" attribute required to get out of compat mode" into honeycomb
2011-01-31 13:37:50 -08:00
Dianne Hackborn
2bfa2ea1ec
Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
...
The "resizeable" attribute of supports-screens was never well documented,
so many apps don't set it. Assuming that if they are explicitly saying
they support large or xlarge screens then they are also implying that they
are resizeable.
Change-Id: Iaa1ad431c9868254af7581499477bff98ed109e5
2011-01-31 12:34:56 -08:00
Jean-Baptiste Queru
27badee3f5
am a6fb375c: am 056340ac: Merge "stubs"
...
* commit 'a6fb375cf727b6ded057110875fe49a9b3f230a3':
stubs
2011-01-31 12:03:59 -08:00
Gilles Debunne
c1eb127f4e
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
2011-01-31 12:01:34 -08:00
Jean-Baptiste Queru
a6fb375cf7
am 056340ac: Merge "stubs"
...
* commit '056340ac95f233090990d77266d89aad3b60f913':
stubs
2011-01-31 11:55:40 -08:00
Daniel Sandler
f4fc099c55
am 4f63da64: Merge "Alignment in the title area of the notification panel." into honeycomb
...
* commit '4f63da64d82131388ff02586e5fe19662fe641de':
Alignment in the title area of the notification panel.
2011-01-31 11:49:03 -08:00
Daniel Sandler
4f63da64d8
Merge "Alignment in the title area of the notification panel." into honeycomb
2011-01-31 11:46:57 -08:00
Jean-Baptiste Queru
056340ac95
Merge "stubs"
2011-01-31 11:32:33 -08:00
Joe Onorato
19a022194d
am fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb
...
* commit 'fe6fd242867022576a99fcd5fd6078fb7bab8451':
Mask out the non public bits, not the public ones.
2011-01-31 11:26:51 -08:00
Joe Onorato
fe6fd24286
Merge "Mask out the non public bits, not the public ones." into honeycomb
2011-01-31 11:25:06 -08:00
Joe Onorato
6ab77bd5b3
Mask out the non public bits, not the public ones.
...
Bug: 3406103
Change-Id: I44b16700567cb2bf76efe9e8c1f9c82d0eaa8f10
2011-01-31 11:21:10 -08:00
Gilles Debunne
85ebed39e4
am ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
...
* commit 'ccfcd9e813d090ec9b4390b5217b32f73dd8263d':
Fxi initial error popup dialog in TextEdit and refreshed assets.
2011-01-31 11:13:24 -08:00
Gilles Debunne
ccfcd9e813
Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
2011-01-31 11:10:53 -08:00
Jeff Hamilton
737fe5480f
am ddd11292: Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
...
* commit 'ddd11292d1be8d33989e3a67bf6398464ef2632c':
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
2011-01-31 11:03:50 -08:00
Jeff Hamilton
ddd11292d1
Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
2011-01-31 11:01:07 -08:00
Daniel Sandler
b0b68901f2
Alignment in the title area of the notification panel.
...
Clock size -> 78sp to match specs
Clock right pad -> 6dp to achieve 14dp escapement
Bug: 3400754
Change-Id: I04a56aa899ab55804ad034ed06d9c7aaad331bc0
2011-01-31 13:40:37 -05:00
Jeff Hamilton
1d04981fb2
am f7176dfb: am 113834c5: Commit the final API for level 10.
...
* commit 'f7176dfbd284f7da49e5bccc2aa886b42039ba4a':
Commit the final API for level 10.
2011-01-31 10:11:46 -08:00
Jeff Hamilton
f7176dfbd2
am 113834c5: Commit the final API for level 10.
...
* commit '113834c5ab30bfc554202d0f3144a662d77f2484':
Commit the final API for level 10.
2011-01-31 10:05:13 -08:00
Jeff Hamilton
81c31c95c1
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
...
Change-Id: If1d1ff69a6f3e80796d68ec5dbfa722adce23d40
2011-01-31 12:00:35 -06:00
Jeff Hamilton
113834c5ab
Commit the final API for level 10.
...
Change-Id: I56140f79ff599c1a9d03c0f53d700df402234bf1
2011-01-31 11:46:29 -06:00
Daniel Sandler
c05ddc111f
am cb9d4d28: Merge "Kill spurious animations when vetoing notifications." into honeycomb
...
* commit 'cb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f':
Kill spurious animations when vetoing notifications.
2011-01-31 09:08:00 -08:00
Daniel Sandler
cb9d4d28be
Merge "Kill spurious animations when vetoing notifications." into honeycomb
2011-01-31 09:04:32 -08:00
Tadashi G. Takaoka
ed670b8b25
am 81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb
...
* commit '81f4b582d4f3547bcd432da6bcb21d4ef414723d':
Fix hardware keyboard switch listener
2011-01-31 08:49:30 -08:00
Tadashi G. Takaoka
81f4b582d4
Merge "Fix hardware keyboard switch listener" into honeycomb
2011-01-31 08:47:12 -08:00
Leon Scroggins
5592f0b16e
am 22e883dd: For Textareas, do not use UI side layers.
...
* commit '22e883dd4a400122003506f47b228378000dd12f':
For Textareas, do not use UI side layers.
2011-01-31 08:24:31 -08:00
Tadashi G. Takaoka
1c9debfb18
Fix hardware keyboard switch listener
...
Bug: 3391067
Change-Id: I64ae55652afedee60a70bc140cfb328b04bc8c83
2011-02-01 01:08:19 +09:00
Leon Scroggins
22e883dd4a
For Textareas, do not use UI side layers.
...
Bug:3402831
Bug:3401242
Requires a change in external/webkit.
Change-Id: I391d9133b3953d213520cbba5ed49b11ebeaef2d
2011-01-31 11:05:53 -05:00
Gil Dobjanschi
1aa865aae0
am 2bb13573: Bug fix: 3405930 Crash editing overlay text
...
* commit '2bb13573d619e3371d06847d36db78a20b17dfab':
Bug fix: 3405930 Crash editing overlay text
2011-01-31 04:13:06 -08:00
Gil Dobjanschi
2bb13573d6
Bug fix: 3405930 Crash editing overlay text
...
Change-Id: Icd304ef8dde2b41812b14857dc3c112cc22d578e
2011-01-31 03:57:15 -08:00
Wink Saville
bac75416d1
am cde85d57: Merge "Add debug for tracking bug 3404006." into honeycomb
...
* commit 'cde85d573873adce9ebcf0d2c4c2c5c1b8d465cc':
Add debug for tracking bug 3404006.
2011-01-30 23:14:39 -08:00
Wink Saville
cde85d5738
Merge "Add debug for tracking bug 3404006." into honeycomb
2011-01-30 23:12:35 -08:00
Bart Sears
5a7737138e
am e3004e78: New DroidSansFallback font file from Ascender
...
* commit 'e3004e7867925e70bf4930384a265106f45f87d6':
New DroidSansFallback font file from Ascender
2011-01-30 20:08:13 -08:00
Bart Sears
e3004e7867
New DroidSansFallback font file from Ascender
...
Bug: 3315583
1) IPA (U+0250-U+02AF)
2) Currency symbols
3) U+02BB MODIFIER LETTER TURNED COMMA
4) Non-breaking hyphen ("\u2011")
5) Jamo U+11xx mappings
Change-Id: Ie4dfc7677d0f63c89ed0e1f6506cd513ae45ffa9
2011-01-30 19:59:02 -08:00
Daniel Sandler
2c83180e70
Kill spurious animations when vetoing notifications.
...
Bug: 3406032
Change-Id: I6da6ee064d309bc44f6304722c5f3f4e05aaf687
2011-01-30 21:26:24 -05:00
Dheeraj Sharma
60a3ead52e
am cd73d1ed: Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb
...
* commit 'cd73d1ed6d1149a2ae642e87ffe8d89100fbafec':
Fix for issue 3404671 Crash when exporting movie in JNI
2011-01-30 18:14:40 -08:00
Dheeraj Sharma
cd73d1ed6d
Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb
2011-01-30 18:12:25 -08:00
Dianne Hackborn
97510f6abd
am 260c3c77: Fix issue #3381489 : IllegalStateException: attempt to re-open...
...
* commit '260c3c77d9b340164e055f87002c64d78da6e836':
Fix issue #3381489 : IllegalStateException: attempt to re-open...
2011-01-30 18:05:08 -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
Joe Onorato
0bab356fd8
am fba54f62: Merge "I declare settings panel icon VICTORY!" into honeycomb
...
* commit 'fba54f620ff155ede6de7d73f1b6a0003839b1c4':
I declare settings panel icon VICTORY!
2011-01-30 17:58:47 -08:00
Joe Onorato
fba54f620f
Merge "I declare settings panel icon VICTORY!" into honeycomb
2011-01-30 17:56:25 -08:00
Joe Onorato
de7feddc87
I declare settings panel icon VICTORY!
...
Bug: 3396115
Change-Id: I72c46361506ec48bf3ebc9b84dbc476c301ce20c
2011-01-30 17:46:32 -08:00
John Reck
a4b2316416
am 13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
...
* commit '13934c2d71046cdd2e7ca33528b91cb83f82dc13':
Prevent SET_SCROLL_OFFSET spam from clogging tubes
2011-01-30 17:12:29 -08:00
John Reck
13934c2d71
Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
2011-01-30 16:55:23 -08:00
Dharmaray Kundargi
0cc515b4ad
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
2011-01-30 16:35:08 -08:00
Dharmaray Kundargi
75aa290d5d
am ff843254: Merge "Merging the same files on top of tree." into honeycomb
...
* commit 'ff8432548eb96655190486ee0f0fa08de5451e66':
Merging the same files on top of tree.
2011-01-30 16:35:03 -08:00