Jeff Brown
4257e3b181
am ce6578ac: am 84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0
...
* commit 'ce6578acc5729f76fc93b6daafede413703a8d19':
Fix copyStringToBuffer row index calculation. Bug: 5515552
2011-10-28 08:24:11 +00: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
3e7af943fe
am c1a1cca8: Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1
...
* commit 'c1a1cca866ff76a6dbfa500292593d8031908a9b':
Fix 5487180: Check for empty plmn/spn strings instead of just null
2011-10-28 07:26:05 +00: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
9c8a4363b0
am ca50b44e: am c43b9b6d: Merge "Add SFR DUN configuration." into ics-mr0
...
* commit 'ca50b44e2f8a279a37c31dbf9571e12a1e429493':
Add SFR DUN configuration.
2011-10-28 04:10:54 +00: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
Peter Ng
632c4a32e6
am 81bd76e4: Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1
...
* commit '81bd76e4b33ea00d30bb2b2193ca5bd0cf445546':
Removing 2nd background clock font display from statusbar and lock screen
2011-10-28 02:53:26 +00:00
Jake Hamby
82559e8f01
am e3a31d03: am 31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
...
* commit 'e3a31d0340802352d568c8c35ff1fa1047018a42':
Fix bug in enabling/disabling SMS cell broadcast activation.
2011-10-28 02:53:24 +00:00
Justin Ho
7a0c0d5a3e
am a196c688: am 9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0
...
* commit 'a196c688ed1c8aa92d711b53c4dabd7d1399e740':
Increase navigation icon brightness by 10%
2011-10-28 02:53:23 +00:00
Justin Ho
c3f48169d5
am 64653ac2: am e7ff3906: Merge "Increase notification icon brightness" into ics-mr0
...
* commit '64653ac2fa32a679f0695495764146a4be47897e':
Increase notification icon brightness
2011-10-28 02:53:21 +00:00
Jamie Gennis
e396e993a5
am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
...
* commit 'fc9592f8a5f2f75207e5e532655ac294eb2b334b':
Stagefright: ANW::connect in MediaPlayerService
2011-10-28 02:53:20 +00:00
Robert Greenwalt
258f52fed3
am 859bf0f2: am 81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0
...
* commit '859bf0f2efb7b5518055893c17aa3a6437023633':
Temp disable Tethering if DUN is required
2011-10-28 02:53:18 +00:00
Justin Ho
b7811355cf
am 1b15f7f1: (-s ours) am 28b3fd13: Merge "Correctly updating Roboto HHEA table" into ics-mr0
...
* commit '1b15f7f1abc73683fe067e4b0b00e2e5c70a6282':
Correctly updating Roboto HHEA table
2011-10-28 02:53:17 +00: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
d2401cfb2b
am ea1db611: Fix build. Forgot to add files. :(
...
* commit 'ea1db611b493d70e82641f8dc01d4a4c4ffcd3e7':
Fix build. Forgot to add files. :(
2011-10-28 02:08:18 +00:00
Dianne Hackborn
ea1db611b4
Fix build. Forgot to add files. :(
...
Change-Id: I89dcc247d957a4873c56017bc262dd717d236258
2011-10-27 19:03:14 -07:00
Dianne Hackborn
d323069ab0
am 114ac293: Merge "New framework performance tests." into ics-mr1
...
* commit '114ac293b8df1e1db817603bcb77507451e87cd4':
New framework performance tests.
2011-10-28 01:37:40 +00:00
Dianne Hackborn
114ac293b8
Merge "New framework performance tests." into ics-mr1
2011-10-27 18:34:04 -07:00
Daniel Sandler
15fade2ebd
am d939dd2e: Merge "Fix race condition in status bar init code." into ics-mr1
...
* commit 'd939dd2eaacbe898dc82170a4b41a7248fe182e6':
Fix race condition in status bar init code.
2011-10-28 00:59:12 +00: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
Gilles Debunne
006fa48bce
Cleaning and new constant in ViewConfiguration
...
Fixed the documentation and comments for dips versus pixels.
Added a new DOUBLE_TAP_TOUCH_SLOP to replace the hard-coded and
*unscaled* value used in GestureDetector. Assuming this value was
ok for hdpi devices, set it to 20 / 1.5 ~= 16 in dips.
New method kept hidden to keep API unchanged.
Change-Id: I6d237faa2fdb7714e0e3558978af130df9a061a5
2011-10-27 17:26:58 -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
Raphael
f51125d842
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: I5b8ac36749263205a19f1448b1aaca90d5a2e06d
2011-10-27 17:11:21 -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
Justin Ho
e7ff39066c
Merge "Increase notification icon brightness" into ics-mr0
2011-10-27 16:36:52 -07:00
Justin Ho
456bb48218
Increase notification icon brightness
...
Bug: 5526912
Change-Id: Ieca2160bc3ecfc11dc2196491a74956d7554eaa5
2011-10-27 16:29:42 -07:00
Justin Ho
bceff71b92
Increase navigation icon brightness by 10%
...
Still increase to 1.0 when pressed
Bug: 5509557
Change-Id: I21e5430241f47f3ac8cec2b1f67973c42d23c207
2011-10-27 16:27:54 -07:00
Mangesh Ghiware
e87d2da0b4
am ade26e2e: Merge "Fix restore of view and text wrap scales." into ics-mr1
...
* commit 'ade26e2e383cd0041f8aa94467d119c2bd1ee5e8':
Fix restore of view and text wrap scales.
2011-10-27 23:15:58 +00:00
Mangesh Ghiware
ade26e2e38
Merge "Fix restore of view and text wrap scales." into ics-mr1
2011-10-27 16:11:32 -07:00