60630 Commits

Author SHA1 Message Date
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
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
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
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
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