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
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
ade26e2e38
Merge "Fix restore of view and text wrap scales." into ics-mr1
2011-10-27 16:11:32 -07:00
Jamie Gennis
08479ceeba
Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
2011-10-27 16:04:45 -07:00
Dianne Hackborn
d4c4b76889
New framework performance tests.
...
Change-Id: Ib8cc6704f508b7516ba0a30aa71bb88ef028691d
2011-10-27 16:03:14 -07:00
Adam Powell
635c60af62
Add API for deferring fragment start.
...
Fragments now have the setDeferStart method to signal that a fragment
has lower priority than others. Deferred start fragments will not
always be started immediately; they will be started once any loaders
have finished servicing any outstanding requests. This is useful if
any attached fragments are not immediately visible and can wait to
start until later.
Disabling deferStart on a fragment that is waiting for a deferred
start will start it immediately. Start.
Change-Id: Ia1f004877ca5e88d4f10147d21c7e2e97f141c34
2011-10-27 15:54:51 -07:00
Robert Greenwalt
81433a3878
Merge "Temp disable Tethering if DUN is required" into ics-mr0
2011-10-27 15:43:47 -07:00
Mathias Agopian
7165b92e71
Merge "fix Corrupted graphics while playing You Tube on orientation change" into ics-mr1
2011-10-27 15:37:33 -07:00
Justin Ho
28b3fd136d
Merge "Correctly updating Roboto HHEA table" into ics-mr0
2011-10-27 15:26:42 -07:00
James Dong
da57c0e8cf
Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
2011-10-27 15:24:28 -07:00
Bart Sears
88fbb19a55
am 777e682f: Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0
...
* commit '777e682f13c8874f60ca21cb9264ae26a9d19a40':
Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list
2011-10-27 22:21:34 +00:00
Mangesh Ghiware
f0e96d54b6
Fix restore of view and text wrap scales.
...
Fixes bug 5507881: Open pages in overview doesn't stick on initial
browser load.
Update the fix for bug 5230909: Zoom not restored on Back.
Added a boolean to indicate that scales have been restored. In the case
of restored scales (view and text wrap) being zero, set them to overview
and reading level respectively.
Change-Id: I5a22dd2040a22ee3b48c5903b586a65a4fa320f2
2011-10-27 15:20:49 -07:00
Bart Sears
777e682f13
Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0
2011-10-27 15:20:12 -07:00
Michael Jurka
c4f09e0309
Merge "Fix recents button on large devices (5490265)" into ics-mr1
2011-10-27 14:55:37 -07:00
Justin Ho
b5cc0e1d3d
Correctly updating Roboto HHEA table
...
Bug: 5516773
The last change regressed a few glyphs since the wrong file was checked in
Change-Id: I1f42c2ef9d57e840804d431183a07b0ed8640ea4
2011-10-27 14:53:20 -07:00
Robert Greenwalt
4efe58d8e7
Temp disable Tethering if DUN is required
...
Getting source-based routing working is too risk for this point
in the project but tethering is broken otherwise, so disable
the tethering option if DUN is required until we can get a real
fix in.
bug:5495862
Change-Id: I5e852bf30c887599024a8b61af86ffec1d5333af
2011-10-27 14:50:27 -07:00
Eric Fischer
d01b6451c6
am 60912254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '60912254972abee324f10f57b0093732aa01adb8':
Import revised translations. DO NOT MERGE
2011-10-27 21:46:42 +00:00
Robert Greenwalt
52201ae542
am 8d059ac5: Merge "Fix Tethering settings." into ics-mr0
...
* commit '8d059ac5b186547a86bb92678c7d1cb13fd8ce1c':
Fix Tethering settings.
2011-10-27 21:46:35 +00:00
Scott Main
b4e50fe03c
Merge "resolved conflicts for merge of b6cf4b7f to ics-mr1" into ics-mr1
2011-10-27 14:43:50 -07:00
RoboErik
8805dc137a
Merge "b/5309787 Add new columns to hidden list of read only fields" into ics-mr1
2011-10-27 14:41:03 -07:00
Scott Main
e815a58557
resolved conflicts for merge of b6cf4b7f to ics-mr1
...
Change-Id: Ie5b151ad0dbaf6577b836f10f74181b898f26320
2011-10-27 14:40:53 -07:00
RoboErik
c7ef9390cf
b/5309787 Add new columns to hidden list of read only fields
...
Change-Id: I9bfc01e4211087be0dfd144c022903c51817c024
2011-10-27 14:11:44 -07:00
James Dong
17a5fb36f8
Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
2011-10-27 14:09:50 -07:00
Eric Fischer
6091225497
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-27 13:59:51 -07:00