OSDN Git Service
Peter Ng [Fri, 28 Oct 2011 22:20:56 +0000 (15:20 -0700)]
Merge "Stat_notify visual asset updates" into ics-mr1
Peter Ng [Fri, 28 Oct 2011 22:20:27 +0000 (15:20 -0700)]
Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1
Chet Haase [Fri, 28 Oct 2011 22:13:27 +0000 (15:13 -0700)]
Merge "Optimize handling of scrolled wallpapers" into ics-mr1
Svetoslav Ganov [Fri, 28 Oct 2011 21:20:52 +0000 (14:20 -0700)]
Merge "Fixing a memory leak in accessibility enteraction APIs." into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 20:59:31 +0000 (13:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Gilles Debunne [Fri, 28 Oct 2011 20:44:17 +0000 (20:44 +0000)]
am
4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0
* commit '
4eec98edee3d6eb516e30a7151da13fd726f93a9':
Text handles do not handle scroll correctly
Gilles Debunne [Fri, 28 Oct 2011 20:41:01 +0000 (13:41 -0700)]
Merge "Text handles do not handle scroll correctly" into ics-mr0
The Android Open Source Project [Fri, 28 Oct 2011 20:05:26 +0000 (13:05 -0700)]
Reconcile with ics-mr0-release
Change-Id: I6997b52967863156cd151e368e891b63024ebbb1
Jeff Sharkey [Fri, 28 Oct 2011 19:24:44 +0000 (12:24 -0700)]
Merge "Differentiate between system_server and unknown." into ics-mr1
Daniel Sandler [Fri, 28 Oct 2011 19:21:22 +0000 (12:21 -0700)]
Merge "Tuning parameters for mobile RSSI." into ics-mr1
Raphael [Fri, 28 Oct 2011 18:54:36 +0000 (18:54 +0000)]
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.
Peter Ng [Fri, 28 Oct 2011 17:53:54 +0000 (10:53 -0700)]
Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
Adam Powell [Fri, 28 Oct 2011 17:43:33 +0000 (10:43 -0700)]
Merge "Add API for deferring fragment start." into ics-mr1
The Android Automerger [Fri, 28 Oct 2011 16:53:33 +0000 (09:53 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Scott Main [Fri, 28 Oct 2011 16:39:46 +0000 (16:39 +0000)]
am
b44038fd: docs: platform note typo
* commit '
b44038fd294382d42070eb60df3bf5132eb4cb29':
docs: platform note typo
Andreas Huber [Fri, 28 Oct 2011 16:13:54 +0000 (09:13 -0700)]
Merge "Properly report that we're no longer playing after receiving event" into ics-mr1
Daniel Sandler [Fri, 28 Oct 2011 13:29:51 +0000 (06:29 -0700)]
Merge "Fix initial Bluetooth icon state." into ics-mr1
Narayan Kamath [Fri, 28 Oct 2011 09:15:04 +0000 (02:15 -0700)]
Merge "Widen permissions on synthesized files." into ics-mr1
Jeff Brown [Fri, 28 Oct 2011 08:20:20 +0000 (08:20 +0000)]
am
84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug:
5515552" into ics-mr0
* commit '
84bee4f8746a19428e0ddfd10df1130324dc39fa':
Fix copyStringToBuffer row index calculation. Bug:
5515552
Jeff Brown [Fri, 28 Oct 2011 08:18:07 +0000 (01:18 -0700)]
Merge "Fix copyStringToBuffer row index calculation. Bug:
5515552" into ics-mr0
Jim Miller [Fri, 28 Oct 2011 07:22:53 +0000 (00:22 -0700)]
Merge "Fix
5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1
Robert Greenwalt [Fri, 28 Oct 2011 04:06:09 +0000 (04:06 +0000)]
am
c43b9b6d: Merge "Add SFR DUN configuration." into ics-mr0
* commit '
c43b9b6d97ed6dc40e181843aa79159c504e7004':
Add SFR DUN configuration.
Robert Greenwalt [Fri, 28 Oct 2011 04:04:17 +0000 (21:04 -0700)]
Merge "Add SFR DUN configuration." into ics-mr0
Peter Ng [Fri, 28 Oct 2011 02:17:19 +0000 (19:17 -0700)]
Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1
Jake Hamby [Fri, 28 Oct 2011 02:14:08 +0000 (02:14 +0000)]
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.
Justin Ho [Fri, 28 Oct 2011 02:14:05 +0000 (02:14 +0000)]
am
9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0
* commit '
9e7407ed2b18800291612fb9fb355ef062801f07':
Increase navigation icon brightness by 10%
Justin Ho [Fri, 28 Oct 2011 02:14:04 +0000 (02:14 +0000)]
am
e7ff3906: Merge "Increase notification icon brightness" into ics-mr0
* commit '
e7ff39066c42f66913dbe23f61478273daa30f4d':
Increase notification icon brightness
Jamie Gennis [Fri, 28 Oct 2011 02:14:01 +0000 (02:14 +0000)]
am
08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
* commit '
08479ceeba56c460fb52f60a24df27776f1936c3':
Stagefright: ANW::connect in MediaPlayerService
Robert Greenwalt [Fri, 28 Oct 2011 02:13:59 +0000 (02:13 +0000)]
am
81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0
* commit '
81433a38784e64dbc155047a3915cf5eff32840b':
Temp disable Tethering if DUN is required
Justin Ho [Fri, 28 Oct 2011 02:13:56 +0000 (02:13 +0000)]
am
28b3fd13: Merge "Correctly updating Roboto HHEA table" into ics-mr0
* commit '
28b3fd136d713b4d94fc72113e1ff42637374d2a':
Correctly updating Roboto HHEA table
Dianne Hackborn [Fri, 28 Oct 2011 01:34:04 +0000 (18:34 -0700)]
Merge "New framework performance tests." into ics-mr1
Daniel Sandler [Fri, 28 Oct 2011 00:54:50 +0000 (17:54 -0700)]
Merge "Fix race condition in status bar init code." into ics-mr1
Jake Hamby [Fri, 28 Oct 2011 00:46:32 +0000 (17:46 -0700)]
Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
The Android Automerger [Fri, 28 Oct 2011 00:42:17 +0000 (17:42 -0700)]
Revert "Clean up CursorWindow code."
This reverts commit
3bc6bbc92cd2095f42039b5aadd0a14d0e5d9230.
The Android Automerger [Fri, 28 Oct 2011 00:41:26 +0000 (17:41 -0700)]
Revert "Fix regression in CursorWindow.copyStingToBuffer."
This reverts commit
d0ff68da6a606602235fb8749473999e3d1bde53.
The Android Automerger [Fri, 28 Oct 2011 00:39:53 +0000 (17:39 -0700)]
Revert "Use ashmem for CursorWindows."
This reverts commit
0cde89f5f025b7826be009ebb9673b970e180e32.
Justin Ho [Thu, 27 Oct 2011 23:37:02 +0000 (16:37 -0700)]
Merge "Increase navigation icon brightness by 10%" into ics-mr0
Justin Ho [Thu, 27 Oct 2011 23:36:52 +0000 (16:36 -0700)]
Merge "Increase notification icon brightness" into ics-mr0
Mangesh Ghiware [Thu, 27 Oct 2011 23:11:32 +0000 (16:11 -0700)]
Merge "Fix restore of view and text wrap scales." into ics-mr1
Jamie Gennis [Thu, 27 Oct 2011 23:04:45 +0000 (16:04 -0700)]
Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
Robert Greenwalt [Thu, 27 Oct 2011 22:43:47 +0000 (15:43 -0700)]
Merge "Temp disable Tethering if DUN is required" into ics-mr0
Mathias Agopian [Thu, 27 Oct 2011 22:37:33 +0000 (15:37 -0700)]
Merge "fix Corrupted graphics while playing You Tube on orientation change" into ics-mr1
Justin Ho [Thu, 27 Oct 2011 22:26:42 +0000 (15:26 -0700)]
Merge "Correctly updating Roboto HHEA table" into ics-mr0
James Dong [Thu, 27 Oct 2011 22:24:28 +0000 (15:24 -0700)]
Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
Bart Sears [Thu, 27 Oct 2011 22:21:34 +0000 (22:21 +0000)]
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
Bart Sears [Thu, 27 Oct 2011 22:20:12 +0000 (15:20 -0700)]
Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0
Michael Jurka [Thu, 27 Oct 2011 21:55:37 +0000 (14:55 -0700)]
Merge "Fix recents button on large devices (
5490265)" into ics-mr1
Eric Fischer [Thu, 27 Oct 2011 21:46:42 +0000 (21:46 +0000)]
am
60912254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
60912254972abee324f10f57b0093732aa01adb8':
Import revised translations. DO NOT MERGE
Robert Greenwalt [Thu, 27 Oct 2011 21:46:35 +0000 (21:46 +0000)]
am
8d059ac5: Merge "Fix Tethering settings." into ics-mr0
* commit '
8d059ac5b186547a86bb92678c7d1cb13fd8ce1c':
Fix Tethering settings.
Scott Main [Thu, 27 Oct 2011 21:43:50 +0000 (14:43 -0700)]
Merge "resolved conflicts for merge of
b6cf4b7f to ics-mr1" into ics-mr1
RoboErik [Thu, 27 Oct 2011 21:41:03 +0000 (14:41 -0700)]
Merge "b/
5309787 Add new columns to hidden list of read only fields" into ics-mr1
Scott Main [Thu, 27 Oct 2011 21:40:53 +0000 (14:40 -0700)]
resolved conflicts for merge of
b6cf4b7f to ics-mr1
Change-Id: Ie5b151ad0dbaf6577b836f10f74181b898f26320
James Dong [Thu, 27 Oct 2011 21:09:50 +0000 (14:09 -0700)]
Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
Eric Fischer [Thu, 27 Oct 2011 20:59:51 +0000 (13:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
John Reck [Thu, 27 Oct 2011 20:40:24 +0000 (13:40 -0700)]
Merge "Keep text handles in sync with native touch targets" into ics-mr1
Robert Greenwalt [Thu, 27 Oct 2011 20:20:15 +0000 (13:20 -0700)]
Merge "Fix Tethering settings." into ics-mr0
Daniel Sandler [Thu, 27 Oct 2011 20:16:43 +0000 (13:16 -0700)]
Merge "Restore bluetooth icons on tablets." into ics-mr1
RoboErik [Thu, 27 Oct 2011 20:13:36 +0000 (13:13 -0700)]
Merge "Add new Calendar APIs to fw" into ics-mr1
Scott Main [Thu, 27 Oct 2011 18:06:15 +0000 (18:06 +0000)]
am
cbce4eda: Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0
* commit '
cbce4eda4fae6b18efde9aa161a665e92a36c969':
docs: change calendar overview to recommend using data URI instead of MIME type for event intents
Scott Main [Thu, 27 Oct 2011 18:04:46 +0000 (11:04 -0700)]
Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0
satok [Thu, 27 Oct 2011 17:51:51 +0000 (17:51 +0000)]
am
e0122406: Merge "Add a path to HelloSpellChecker sample application for SDK build" into ics-mr0
* commit '
e0122406bb1c512ee57f3a5a1503435a0779e1d8':
Add a path to HelloSpellChecker sample application for SDK build
satok [Thu, 27 Oct 2011 17:50:14 +0000 (10:50 -0700)]
Merge "Add a path to HelloSpellChecker sample application for SDK build" into ics-mr0
Bill Gruber [Thu, 27 Oct 2011 17:45:36 +0000 (17:45 +0000)]
am
6c60e9a3: docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug
5279672
* commit '
6c60e9a3ba3555590d7e7bdaf3634c9daaf8b33b':
docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug
5279672
Scott Main [Thu, 27 Oct 2011 17:04:52 +0000 (17:04 +0000)]
am
56539858: Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0
* commit '
5653985830f35184ea772b2ccc8333d6ef634761':
docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc
Scott Main [Thu, 27 Oct 2011 17:03:10 +0000 (10:03 -0700)]
Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0
Eric Fischer [Thu, 27 Oct 2011 16:43:23 +0000 (09:43 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Andreas Huber [Thu, 27 Oct 2011 16:07:23 +0000 (09:07 -0700)]
Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1
Scott Main [Thu, 27 Oct 2011 15:51:21 +0000 (15:51 +0000)]
am
737c3dd9: Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0
* commit '
737c3dd9f116ae68bcb9b5ce6855afaf2f59738b':
docs: add package description for wifi.p2p and update the one for wifi
Scott Main [Thu, 27 Oct 2011 15:49:48 +0000 (08:49 -0700)]
Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0
Mike Lockwood [Thu, 27 Oct 2011 13:51:04 +0000 (13:51 +0000)]
am
aac4184a: Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0
* commit '
aac4184a5a0ab969140a11e1ef258fcb4cba07a9':
Revert "PowerManagerService: Enable light sensor debug output"
Mike Lockwood [Thu, 27 Oct 2011 13:49:12 +0000 (06:49 -0700)]
Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0
The Android Automerger [Thu, 27 Oct 2011 13:28:33 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jason Sams [Thu, 27 Oct 2011 01:25:38 +0000 (01:25 +0000)]
am
28e4f87f: Fix bug where CPU could be stuck spinning Required the wallpaper be animating and the system to have run slowly during the last frame when rendering stopped.
* commit '
28e4f87f38cae799b494e160467d732e988bad89':
Fix bug where CPU could be stuck spinning Required the wallpaper be animating and the system to have run slowly during the last frame when rendering stopped.
Jim Miller [Thu, 27 Oct 2011 00:05:13 +0000 (17:05 -0700)]
Merge "Fix
5369428: Use full battery state information when determining charge status" into ics-mr1
The Android Automerger [Wed, 26 Oct 2011 23:27:20 +0000 (16:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jaikumar Ganesh [Wed, 26 Oct 2011 23:20:48 +0000 (23:20 +0000)]
am
01d24784: Merge "Fix auto connection of headset profile." into ics-mr0
* commit '
01d24784a5ddece8bb7c5d088bf93c99faa0dc7e':
Fix auto connection of headset profile.
Jaikumar Ganesh [Wed, 26 Oct 2011 23:19:13 +0000 (16:19 -0700)]
Merge "Fix auto connection of headset profile." into ics-mr0
Justin Ho [Wed, 26 Oct 2011 23:18:32 +0000 (23:18 +0000)]
am
d24b020e: Merge "Brighter sysbar assets Bug:
5509557" into ics-mr0
* commit '
d24b020e5e6911591f3535815ef9f86b0d57f65c':
Brighter sysbar assets Bug:
5509557
Justin Ho [Wed, 26 Oct 2011 23:16:52 +0000 (16:16 -0700)]
Merge "Brighter sysbar assets Bug:
5509557" into ics-mr0
Jim Miller [Wed, 26 Oct 2011 22:40:08 +0000 (15:40 -0700)]
Merge "Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE" into ics-mr1
Jeff Sharkey [Wed, 26 Oct 2011 22:37:34 +0000 (15:37 -0700)]
Merge "Only populate stack when StrictMode will use it." into ics-mr1
Justin Ho [Wed, 26 Oct 2011 22:24:36 +0000 (22:24 +0000)]
am
ed124603: Merge "Updated Roboto HHEA table Bug:
5516773" into ics-mr0
* commit '
ed12460301cf0e04ac61993aaf1142f75f504814':
Updated Roboto HHEA table Bug:
5516773
Justin Ho [Wed, 26 Oct 2011 22:22:57 +0000 (15:22 -0700)]
Merge "Updated Roboto HHEA table Bug:
5516773" into ics-mr0
Robert Ly [Wed, 26 Oct 2011 22:15:20 +0000 (22:15 +0000)]
Justin Ho [Wed, 26 Oct 2011 22:15:19 +0000 (22:15 +0000)]
am
7901a2c3: Merge "Adding alternate sound set and corresponding mk file Bug:
5502770" into ics-mr0
* commit '
7901a2c3a1bfefdefd957d3d9b28dee1ca88787d':
Adding alternate sound set and corresponding mk file Bug:
5502770
Mathias Agopian [Wed, 26 Oct 2011 22:11:59 +0000 (15:11 -0700)]
fix Corrupted graphics while playing You Tube on orientation change
Bug:
5432124
Change-Id: If948b9797b1ec6fff80ca5ea94508abcaced9f31
Svetoslav Ganov [Wed, 26 Oct 2011 21:49:29 +0000 (14:49 -0700)]
Merge "NumberPicker does not not fit on Crespo in landscape." into ics-mr1
Svetoslav Ganov [Wed, 26 Oct 2011 21:47:49 +0000 (14:47 -0700)]
Merge "AccessibilityNodeInfo makes incorrect check before calling into the system." into ics-mr1
Justin Ho [Wed, 26 Oct 2011 21:46:15 +0000 (14:46 -0700)]
Merge "Adding alternate sound set and corresponding mk file Bug:
5502770" into ics-mr0
Justin Ho [Wed, 26 Oct 2011 21:39:28 +0000 (21:39 +0000)]
am
650c052a: Merge "Notification icons increased opaqueness by 10%" into ics-mr0
* commit '
650c052aa38447c363163126afffb16f314bbb11':
Notification icons increased opaqueness by 10%
Justin Ho [Wed, 26 Oct 2011 21:37:43 +0000 (14:37 -0700)]
Merge "Notification icons increased opaqueness by 10%" into ics-mr0
Eric Fischer [Wed, 26 Oct 2011 21:06:36 +0000 (21:06 +0000)]
am
e2afc5bd: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
e2afc5bd243e60bdc168ca30284607230fe646f8':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 21:04:34 +0000 (14:04 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Robert Ly [Wed, 26 Oct 2011 20:52:37 +0000 (20:52 +0000)]
am
576ea5eb: Merge "docs: tools/adt r15 rel notes" into ics-mr0
* commit '
576ea5eb919bc944367b7bc7aeb7d02f6d715088':
docs: tools/adt r15 rel notes
Robert Ly [Wed, 26 Oct 2011 20:50:28 +0000 (13:50 -0700)]
Merge "docs: tools/adt r15 rel notes" into ics-mr0
Jamie Gennis [Wed, 26 Oct 2011 20:34:38 +0000 (20:34 +0000)]
am
b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
* commit '
b7b4eaaa05284634d50d581d924a250f1194f66d':
Stagefright: push blank buffers when tearing down
Jamie Gennis [Wed, 26 Oct 2011 20:33:16 +0000 (13:33 -0700)]
Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
satok [Wed, 26 Oct 2011 20:14:36 +0000 (13:14 -0700)]
Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1
Eric Fischer [Wed, 26 Oct 2011 18:32:07 +0000 (11:32 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Svetoslav Ganov [Wed, 26 Oct 2011 18:30:06 +0000 (11:30 -0700)]
Merge "Adding accessibility support to the tablet swipe unlock." into ics-mr1
OSDN Git Service
