Gilles Debunne
4eec98edee
Merge "Text handles do not handle scroll correctly" into ics-mr0
2011-10-28 13:41:01 -07:00
The Android Open Source Project
58ba1b6121
Reconcile with ics-mr0-release
...
Change-Id: I6997b52967863156cd151e368e891b63024ebbb1
2011-10-28 13:05:27 -07:00
Svetoslav Ganov
af5b4f471d
Fixing a memory leak in accessibility enteraction APIs.
...
1. AccessibilityInteractionConnection was non-static inner
class, hence keeping a handle to the enclosing ViewRootImpl
resulting in leaking activities.
bug:5525412
Change-Id: Ie438861663d623d503995844125d9e15d677fc32
2011-10-28 12:41:42 -07:00
Jeff Sharkey
cc16024f10
Merge "Differentiate between system_server and unknown." into ics-mr1
2011-10-28 12:24:44 -07:00
Daniel Sandler
4c7926fa27
Merge "Tuning parameters for mobile RSSI." into ics-mr1
2011-10-28 12:21:22 -07:00
Raphael
48ba4139b9
am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.
...
* commit 'fe9a2a5471616a3267b30013bce36b13a455c0cd':
Cherry-pick f51125d from master to ics-mr0. do not merge.
2011-10-28 18:54:36 +00:00
Raphael
fe9a2a5471
Cherry-pick f51125d from master to ics-mr0. do not merge.
...
AAPT fix printf %zd crash on Windows.
There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.
SDK bugs: 20395, 20986
Change-Id: Ic201faffd871bd4c1b7d173d84b089e09750cd85
2011-10-28 11:31:31 -07:00
Jeff Sharkey
a353d2654a
Differentiate between system_server and unknown.
...
Bug: 5531966
Change-Id: I2b64b04f3f5a8760a2314729e8b90e9dd6699cb4
2011-10-28 11:13:27 -07:00
Gilles Debunne
93347c24a7
Text handles do not handle scroll correctly
...
A recent patch taking scroll into account was applied at the wrong
level. isVisible() expects positions that already take scroll into
account. isOffsetVisible() is where the initial bug was.
Cherry pick of 144415 from master.
Change-Id: I06ceebfb3d7b24aa4adba886c24fcf9d8dd39d2e
2011-10-28 11:08:56 -07:00
Peter Ng
63dd319ebe
Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
2011-10-28 10:53:54 -07:00
Adam Powell
65793dc043
Merge "Add API for deferring fragment start." into ics-mr1
2011-10-28 10:43:33 -07:00
The Android Automerger
36d9a11ac1
merge in ics-mr0-release history after reset to ics-mr0
2011-10-28 09:53:33 -07:00
Scott Main
43eed0039c
am b44038fd: docs: platform note typo
...
* commit 'b44038fd294382d42070eb60df3bf5132eb4cb29':
docs: platform note typo
2011-10-28 16:39:46 +00:00
Scott Main
b44038fd29
docs: platform note typo
...
Change-Id: I257427257573a881acdf7e55804ed5481142ce01
2011-10-28 09:37:19 -07:00
Andreas Huber
27ed12492d
Merge "Properly report that we're no longer playing after receiving event" into ics-mr1
2011-10-28 09:13:54 -07:00
Daniel Sandler
9b5ae0ce51
Tuning parameters for mobile RSSI.
...
* Allow phone RSSI to be shown instead of data
* Allow "3G" to be shown for all sub-4G networks
Change-Id: I0dc61ee039d1065ad6ccd63a2b2420edc62cb62e
2011-10-28 09:36:09 -04:00
Daniel Sandler
ae561ae62f
Merge "Fix initial Bluetooth icon state." into ics-mr1
2011-10-28 06:29:51 -07:00
satok
a17b350623
Add a flag for recommended suggestions of the spell checker
...
Bug: 5356130
Change-Id: I8361a2750670dadd514d02dd24bf492ce42ff8fc
2011-10-28 20:51:14 +09:00
satok
15452a487a
Hide ime switcher when the screen is turned off.
...
Bug: 5481999
Change-Id: Ifc870f1350db2a67405c05f6de447a69dc050408
2011-10-28 19:42:58 +09:00
Narayan Kamath
7a2f6f38fe
Merge "Widen permissions on synthesized files." into ics-mr1
2011-10-28 02:15:04 -07:00
Jeff Brown
ce6578acc5
am 84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0
...
* commit '84bee4f8746a19428e0ddfd10df1130324dc39fa':
Fix copyStringToBuffer row index calculation. Bug: 5515552
2011-10-28 08:20:20 +00:00
Jeff Brown
84bee4f874
Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0
2011-10-28 01:18:07 -07:00
Jim Miller
c1a1cca866
Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1
2011-10-28 00:22:53 -07:00
Robert Greenwalt
ca50b44e2f
am c43b9b6d: Merge "Add SFR DUN configuration." into ics-mr0
...
* commit 'c43b9b6d97ed6dc40e181843aa79159c504e7004':
Add SFR DUN configuration.
2011-10-28 04:06:09 +00:00
Robert Greenwalt
c43b9b6d97
Merge "Add SFR DUN configuration." into ics-mr0
2011-10-27 21:04:17 -07:00
Jeff Brown
0772007b61
Fix copyStringToBuffer row index calculation.
...
Bug: 5515552
Change-Id: I60aa25d2becd3195d6997d23ef5654a31e93bf71
2011-10-27 19:27:11 -07:00
Peter Ng
81bd76e4b3
Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1
2011-10-27 19:17:19 -07:00
Jake Hamby
e3a31d0340
am 31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
...
* commit '31d157bad27e4ecbe415f6f581946b6da7cc2ba3':
Fix bug in enabling/disabling SMS cell broadcast activation.
2011-10-28 02:14:08 +00:00
Justin Ho
a196c688ed
am 9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0
...
* commit '9e7407ed2b18800291612fb9fb355ef062801f07':
Increase navigation icon brightness by 10%
2011-10-28 02:14:05 +00:00
Justin Ho
64653ac2fa
am e7ff3906: Merge "Increase notification icon brightness" into ics-mr0
...
* commit 'e7ff39066c42f66913dbe23f61478273daa30f4d':
Increase notification icon brightness
2011-10-28 02:14:04 +00:00
Jamie Gennis
fc9592f8a5
am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
...
* commit '08479ceeba56c460fb52f60a24df27776f1936c3':
Stagefright: ANW::connect in MediaPlayerService
2011-10-28 02:14:01 +00:00
Robert Greenwalt
859bf0f2ef
am 81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0
...
* commit '81433a38784e64dbc155047a3915cf5eff32840b':
Temp disable Tethering if DUN is required
2011-10-28 02:13:59 +00:00
Justin Ho
1b15f7f1ab
am 28b3fd13: Merge "Correctly updating Roboto HHEA table" into ics-mr0
...
* commit '28b3fd136d713b4d94fc72113e1ff42637374d2a':
Correctly updating Roboto HHEA table
2011-10-28 02:13:56 +00:00
Dianne Hackborn
ea1db611b4
Fix build. Forgot to add files. :(
...
Change-Id: I89dcc247d957a4873c56017bc262dd717d236258
2011-10-27 19:03:14 -07:00
Dianne Hackborn
114ac293b8
Merge "New framework performance tests." into ics-mr1
2011-10-27 18:34:04 -07:00
Jim Miller
be95d77870
Fix 5487180: Check for empty plmn/spn strings instead of just null
...
This fixes a problem where we'd sometimes show a '|' in front of
the spn string or after the plmn string.
Change-Id: I6a3a398b0ddf89fcc8862b275dea0e925873b56a
2011-10-27 17:58:40 -07:00
Daniel Sandler
d939dd2eaa
Merge "Fix race condition in status bar init code." into ics-mr1
2011-10-27 17:54:50 -07:00
Jake Hamby
31d157bad2
Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
2011-10-27 17:46:32 -07:00
The Android Automerger
7ec683b5c7
Revert "Clean up CursorWindow code."
...
This reverts commit 3bc6bbc92cd2095f42039b5aadd0a14d0e5d9230.
2011-10-27 17:42:17 -07:00
The Android Automerger
dd8f899a01
Revert "Restore broken CursorWindow.getType behavior."
...
This reverts commit aa32c30b81134fc7ebd9408f4757d1dc4410f338.
2011-10-27 17:42:01 -07:00
The Android Automerger
f78da99419
Revert "Clean up CursorWindow lifetime."
...
This reverts commit 7ce745248d4de0e6543a559c93423df899832100.
2011-10-27 17:41:45 -07:00
The Android Automerger
8f2eb43b4f
Revert "Fix regression in CursorWindow.copyStingToBuffer."
...
This reverts commit d0ff68da6a606602235fb8749473999e3d1bde53.
2011-10-27 17:41:26 -07:00
The Android Automerger
095b0981d4
Revert "Fix regression in CursorWindow.getString()"
...
This reverts commit 715311fa5aeb39fd0904209e1428a3656c721c3d.
2011-10-27 17:41:04 -07:00
The Android Automerger
8c01cb5818
Revert "Clean up handrolled Binder proxies."
...
This reverts commit df6611d8c0cd69c3dcb93462eb138e0bbf137b88.
2011-10-27 17:40:45 -07:00
The Android Automerger
eb3127eb42
Revert "Fix ownership of CursorWindows across processes."
...
This reverts commit d2183654e03d589b120467f4e98da1b178ceeadb.
2011-10-27 17:40:24 -07:00
The Android Automerger
3014ea3d72
Revert "Use ashmem for CursorWindows."
...
This reverts commit 0cde89f5f025b7826be009ebb9673b970e180e32.
2011-10-27 17:39:53 -07:00
Jim Miller
ccff48b7cb
Removing 2nd background clock font display from statusbar and lock screen
...
Change-Id: If9edfed231cde6590b28fc2115d78bc97b74ae4e
2011-10-27 17:37:48 -07:00
Jake Hamby
f044a370d4
Fix bug in enabling/disabling SMS cell broadcast activation.
...
When enabling/disabling SMS cell broadcast channels, we were not calling
setGsmBroadcastActivation() with the correct value after updating the
message IDs. It should be called with true if any message IDs are enabled,
or false if the list is empty.
Added an isEmpty() method to IntRangeManager, and moved the call to
setGsmBroadcastActivation() in SimSmsInterfaceManager to the end of the
enableCellBroadcastRange() and disableCellBroadcastRange() methods,
where it sets the correct value using the new isEmpty() method to test
if there are any message IDs enabled after updating the range list.
Bug: 5525441
Change-Id: I7d1ebd54dacf1de20910947efbf5e87e1957fd1a
2011-10-27 17:23:09 -07:00
Robert Greenwalt
cd04e9de4c
Add SFR DUN configuration.
...
Note that this will currently get rid of the Tethering option as
DUN tethering is broken, but that should get fixed shortly.
bug:5495862
Change-Id: I3a45529649bf05e1e6631069fc830b4051da4fd3
2011-10-27 17:06:13 -07:00
Justin Ho
9e7407ed2b
Merge "Increase navigation icon brightness by 10%" into ics-mr0
2011-10-27 16:37:02 -07:00