OSDN Git Service
Kenny Root [Thu, 22 Sep 2011 01:56:52 +0000 (18:56 -0700)]
am
9c711282: Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom
* commit '
9c711282ad234e104c34eb4408d85fc1bb149ded':
Unhide new PackageManager APIs for API 14
Justin Ho [Thu, 22 Sep 2011 01:56:50 +0000 (18:56 -0700)]
am
22aa7805: Merge "Thinner clock font" into ics-factoryrom
* commit '
22aa7805dd0d9bf1c31b5cff526fda793477d8a7':
Thinner clock font
John Wang [Thu, 22 Sep 2011 01:56:49 +0000 (18:56 -0700)]
am
6588bba3: Merge "Notify the sim state after callback registration." into ics-factoryrom
* commit '
6588bba33fbf2756253d19764022a743e13573e9':
Notify the sim state after callback registration.
John Wang [Thu, 22 Sep 2011 01:56:47 +0000 (18:56 -0700)]
am
27b402ab: Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom
* commit '
27b402abe5c24a3e21a39458541001ea91465b8f':
Set enable_puk_unlock_screen true by default.
Adam Powell [Thu, 22 Sep 2011 01:26:13 +0000 (18:26 -0700)]
Merge "Fix bug
5300621 - Share menu disappears in gallery"
Kenny Root [Wed, 21 Sep 2011 23:35:52 +0000 (16:35 -0700)]
Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom
Dianne Hackborn [Wed, 21 Sep 2011 23:19:45 +0000 (16:19 -0700)]
Merge "Fix issue #
5253941: ICS ignoring provider's android:process flag"
Dianne Hackborn [Wed, 21 Sep 2011 23:18:38 +0000 (16:18 -0700)]
Merge "Improvements to power manager turning on screen."
Justin Ho [Wed, 21 Sep 2011 22:38:56 +0000 (15:38 -0700)]
Merge "Thinner clock font" into ics-factoryrom
John Wang [Wed, 21 Sep 2011 22:34:28 +0000 (15:34 -0700)]
Merge "Notify the sim state after callback registration." into ics-factoryrom
John Wang [Wed, 21 Sep 2011 22:32:39 +0000 (15:32 -0700)]
Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom
Mangesh Ghiware [Wed, 21 Sep 2011 22:20:03 +0000 (15:20 -0700)]
Merge "Use overview scale when restored scale is 0."
Dianne Hackborn [Wed, 21 Sep 2011 22:15:18 +0000 (15:15 -0700)]
Merge "Keyguard sound needs to hold wake lock."
Wink Saville [Wed, 21 Sep 2011 21:14:28 +0000 (14:14 -0700)]
am
4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom
* commit '
4aa8d943a970008915b703758743b107927d96fa':
Reduce connectivity logging
Wink Saville [Wed, 21 Sep 2011 21:12:42 +0000 (14:12 -0700)]
Merge "Reduce connectivity logging" into ics-factoryrom
Adam Powell [Wed, 21 Sep 2011 21:06:41 +0000 (14:06 -0700)]
Merge "Fix bug
5341804 - Unable to type into the find on page CAB"
Andreas Huber [Wed, 21 Sep 2011 20:56:09 +0000 (13:56 -0700)]
Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
Jack Palevich [Wed, 21 Sep 2011 19:40:41 +0000 (12:40 -0700)]
Merge "Avoid allocating temporary memory for Matrix operations."
Adam Cohen [Wed, 21 Sep 2011 18:19:36 +0000 (11:19 -0700)]
am
41298971: Merge "Fixing disappearing lock screen, issue
5319246" into ics-factoryrom
* commit '
41298971c774a336257fff4a97ed5d5505bbfb60':
Fixing disappearing lock screen, issue
5319246
Adam Cohen [Wed, 21 Sep 2011 18:17:19 +0000 (11:17 -0700)]
Merge "Fixing disappearing lock screen, issue
5319246" into ics-factoryrom
Glenn Kasten [Wed, 21 Sep 2011 17:51:43 +0000 (10:51 -0700)]
Merge "Bug
5234242 audio continues after discontinuity"
Jean-Michel Trivi [Wed, 21 Sep 2011 16:36:56 +0000 (09:36 -0700)]
am
9c43016b: Merge "Bug
5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom
* commit '
9c43016b52afa855156aac2dc81a2bbe1e4ab436':
Bug
5045498 Keep track of RemoteControlClient play state change time
Jean-Michel Trivi [Wed, 21 Sep 2011 16:34:59 +0000 (09:34 -0700)]
Merge "Bug
5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom
Justin Ho [Wed, 21 Sep 2011 16:17:41 +0000 (09:17 -0700)]
am
7a2063b1: Merge "New sync icon for Phone stat_sys area Bug:
5076774" into ics-factoryrom
* commit '
7a2063b1d59dd6d7575dc91b6dd93b4a8d462b16':
New sync icon for Phone stat_sys area Bug:
5076774
Justin Ho [Wed, 21 Sep 2011 16:15:53 +0000 (09:15 -0700)]
Merge "New sync icon for Phone stat_sys area Bug:
5076774" into ics-factoryrom
Jason Sams [Wed, 21 Sep 2011 15:53:10 +0000 (08:53 -0700)]
Merge "Cleanup RS logs Reduce the startup/shutdown info and format the logs in a consistent manner."
Marco Nelissen [Wed, 21 Sep 2011 15:48:46 +0000 (08:48 -0700)]
Merge "MediaScanner: To query row ids of music files when handling playlists."
Justin Ho [Wed, 21 Sep 2011 15:01:18 +0000 (08:01 -0700)]
am
9d48b578: Merge "Fixing low battery dialog" into ics-factoryrom
* commit '
9d48b578096a14441e2063c0e54dbba4340fa178':
Fixing low battery dialog
Justin Ho [Wed, 21 Sep 2011 14:59:32 +0000 (07:59 -0700)]
Merge "Fixing low battery dialog" into ics-factoryrom
The Android Open Source Project [Wed, 21 Sep 2011 13:19:16 +0000 (06:19 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I401a78a2216c8c4042f6f48b4e882035cbccfc82
Chih-Chung Chang [Wed, 21 Sep 2011 09:26:08 +0000 (02:26 -0700)]
Merge "Fix
5229466: don't consume pointer events outside the window"
Wu-cheng Li [Wed, 21 Sep 2011 09:21:26 +0000 (02:21 -0700)]
am
5f0ef5fb: Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
* commit '
5f0ef5fb0c2e65ca3d0aa4fcd2b300d4cd0a2b4b':
Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
The Android Automerger [Wed, 21 Sep 2011 03:43:04 +0000 (20:43 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Justin Ho [Wed, 21 Sep 2011 01:54:05 +0000 (18:54 -0700)]
am
a2520fc1: Merge "Ensure all clock fonts match Bug:
5340112" into ics-factoryrom
* commit '
a2520fc13652126227e8b602af4566849c216f28':
Ensure all clock fonts match Bug:
5340112
Justin Ho [Wed, 21 Sep 2011 01:52:38 +0000 (18:52 -0700)]
Merge "Ensure all clock fonts match Bug:
5340112" into ics-factoryrom
Justin Ho [Wed, 21 Sep 2011 01:40:58 +0000 (18:40 -0700)]
am
3c3fa0b9: Merge "Updated stat_ icons" into ics-factoryrom
* commit '
3c3fa0b9aaeed8d707df2221822a8d324e95037b':
Updated stat_ icons
Justin Ho [Wed, 21 Sep 2011 01:38:54 +0000 (18:38 -0700)]
Merge "Updated stat_ icons" into ics-factoryrom
Mathias Agopian [Wed, 21 Sep 2011 01:28:12 +0000 (18:28 -0700)]
am
6db5b55f: Merge changes I3f0e01b0,I946cbc78,I9d3ad801 into ics-factoryrom
* commit '
6db5b55f7c9242ff0d780351192c317d4c1d4768':
fix transition from full overlays to fb
rename mInvalidRegion to mSwapRegion
improve hwc dumpsys
Mathias Agopian [Wed, 21 Sep 2011 01:26:05 +0000 (18:26 -0700)]
Merge changes I3f0e01b0,I946cbc78,I9d3ad801 into ics-factoryrom
* changes:
fix transition from full overlays to fb
rename mInvalidRegion to mSwapRegion
improve hwc dumpsys
Amith Yamasani [Wed, 21 Sep 2011 01:07:50 +0000 (18:07 -0700)]
am
9fdba999: Merge "If "Pulse notification light" is off, don\'t flash the LED even once." into ics-factoryrom
* commit '
9fdba9997df17d2ae6d7ddc44513f67f12f81c88':
If "Pulse notification light" is off, don't flash the LED even once.
Amith Yamasani [Wed, 21 Sep 2011 01:06:15 +0000 (18:06 -0700)]
Merge "If "Pulse notification light" is off, don't flash the LED even once." into ics-factoryrom
Gilles Debunne [Wed, 21 Sep 2011 01:02:45 +0000 (18:02 -0700)]
Merge "Bug
5248215: Even though I turned off the Spelling correction, it still shows up"
Svetoslav Ganov [Wed, 21 Sep 2011 01:00:26 +0000 (18:00 -0700)]
Merge "System not checking if enabled services are installed when disabling accessibility."
Mathias Agopian [Wed, 21 Sep 2011 00:21:56 +0000 (17:21 -0700)]
fix transition from full overlays to fb
we need to clear the whole framebuffer in that situation because
we can't trust the content of the FB when partial (fb preserving)
updates are used.
Bug:
5318492
Change-Id: I3f0e01b0fb665a34e44d88ad9f0f54a5d990060b
Mathias Agopian [Wed, 21 Sep 2011 00:22:44 +0000 (17:22 -0700)]
rename mInvalidRegion to mSwapRegion
Change-Id: I946cbc782c0c84645843ea44c3d8b04a0a2fe658
Mathias Agopian [Tue, 20 Sep 2011 22:13:14 +0000 (15:13 -0700)]
improve hwc dumpsys
we now log the buffer's format
Change-Id: I9d3ad8018e884240a153de3baefb6331cb014d0f
Mathias Agopian [Wed, 21 Sep 2011 00:55:24 +0000 (17:55 -0700)]
Merge "fix transition from full overlays to fb"
Mathias Agopian [Wed, 21 Sep 2011 00:55:03 +0000 (17:55 -0700)]
Merge "rename mInvalidRegion to mSwapRegion"
Mathias Agopian [Wed, 21 Sep 2011 00:54:56 +0000 (17:54 -0700)]
Merge "improve hwc dumpsys"
Peter Ng [Wed, 21 Sep 2011 00:53:50 +0000 (17:53 -0700)]
Merge "Slightly transparent notification header to match visuals of the dropdown handle"
Mathias Agopian [Wed, 21 Sep 2011 00:21:56 +0000 (17:21 -0700)]
fix transition from full overlays to fb
we need to clear the whole framebuffer in that situation because
we can't trust the content of the FB when partial (fb preserving)
updates are used.
Bug:
5318492
Change-Id: I3f0e01b0fb665a34e44d88ad9f0f54a5d990060b
Mathias Agopian [Wed, 21 Sep 2011 00:22:44 +0000 (17:22 -0700)]
rename mInvalidRegion to mSwapRegion
Change-Id: I946cbc782c0c84645843ea44c3d8b04a0a2fe658
Mathias Agopian [Tue, 20 Sep 2011 22:13:14 +0000 (15:13 -0700)]
improve hwc dumpsys
we now log the buffer's format
Change-Id: I9d3ad8018e884240a153de3baefb6331cb014d0f
Justin Ho [Wed, 21 Sep 2011 00:53:03 +0000 (17:53 -0700)]
am
474a2784: Merge "Adding missing cleanspec for audio file cleanup" into ics-factoryrom
* commit '
474a27843d0aca41a8dc428af0888c28195c96ef':
Adding missing cleanspec for audio file cleanup
Justin Ho [Wed, 21 Sep 2011 00:51:55 +0000 (17:51 -0700)]
Merge "Adding missing cleanspec for audio file cleanup" into ics-factoryrom
Justin Ho [Wed, 21 Sep 2011 00:46:59 +0000 (17:46 -0700)]
am
b8b10834: Merge "Updated Prime sounds" into ics-factoryrom
* commit '
b8b108348648cd4e2f30e8d46a7b70a2b0ce0d36':
Updated Prime sounds
Justin Ho [Wed, 21 Sep 2011 00:45:15 +0000 (17:45 -0700)]
Merge "Updated Prime sounds" into ics-factoryrom
Svetoslav Ganov [Wed, 21 Sep 2011 00:41:59 +0000 (17:41 -0700)]
Merge "ActivityChooserView not showing highest ranked target if default action not shown."
Tsu Chiang Chuang [Wed, 21 Sep 2011 00:29:12 +0000 (17:29 -0700)]
Merge "point upload to the correct url."
Colin Cross [Wed, 21 Sep 2011 00:21:27 +0000 (17:21 -0700)]
am
5965ba30: dumpstate: add uptime to top of bugreports
* commit '
5965ba30d3ac8f9504681ac2e7ea8ac84aa0c5a7':
dumpstate: add uptime to top of bugreports
Justin Ho [Tue, 20 Sep 2011 23:56:31 +0000 (16:56 -0700)]
Merge "updated stat_ in frameworks"
Irfan Sheriff [Tue, 20 Sep 2011 23:02:42 +0000 (16:02 -0700)]
Merge "Change hostname format to conform to specification"
Eric Fischer [Tue, 20 Sep 2011 22:38:29 +0000 (15:38 -0700)]
am
01ad2a3f: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
01ad2a3fa75902638f49b5bd3258c354f780892e':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 20 Sep 2011 22:35:23 +0000 (15:35 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Svetoslav Ganov [Tue, 20 Sep 2011 21:57:57 +0000 (14:57 -0700)]
Merge "TextView not adding text to accessibility events."
Adam Powell [Tue, 20 Sep 2011 21:36:09 +0000 (14:36 -0700)]
am
6724872b: Merge "Fix bug
5336495 - Silent mode icon on power dialog is wrong" into ics-factoryrom
* commit '
6724872b166d84f640dfa3213e917ecd37333484':
Fix bug
5336495 - Silent mode icon on power dialog is wrong
John Huang [Tue, 20 Sep 2011 21:36:08 +0000 (14:36 -0700)]
am
edc8029b: Merge "Retain signal level even when data is offline." into ics-factoryrom
* commit '
edc8029b8b9ac9233e4dc73f05415265bac712de':
Retain signal level even when data is offline.
Adam Powell [Tue, 20 Sep 2011 21:34:28 +0000 (14:34 -0700)]
Merge "Fix bug
5336495 - Silent mode icon on power dialog is wrong" into ics-factoryrom
John Huang [Tue, 20 Sep 2011 21:34:07 +0000 (14:34 -0700)]
Merge "Retain signal level even when data is offline." into ics-factoryrom
Matthew Xie [Tue, 20 Sep 2011 21:14:29 +0000 (14:14 -0700)]
am
778eccf4: Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom
* commit '
778eccf4923571c77f158e92b2f5f0f7dfd21875':
Check null of pidPair to skip the case the service record has been removed
Justin Ho [Tue, 20 Sep 2011 21:14:16 +0000 (14:14 -0700)]
am
aff24a52: Merge "Updated lockscreen camera assets Bug:
5296921" into ics-factoryrom
* commit '
aff24a52d20a26a8cd374ea6dd284eee16e4ffc0':
Updated lockscreen camera assets Bug:
5296921
Daniel Sandler [Tue, 20 Sep 2011 21:14:15 +0000 (14:14 -0700)]
am
d1d07432: Merge "More debug logs for RSSI updates." into ics-factoryrom
* commit '
d1d074326d81b6a92cff5a5fc279b8c9177cc7aa':
More debug logs for RSSI updates.
RoboErik [Tue, 20 Sep 2011 21:14:11 +0000 (14:14 -0700)]
am
bbb11b80: Merge "Add a warning to changing colors in the docs" into ics-factoryrom
* commit '
bbb11b80106c8687f2833c3d4b538029fc0805e6':
Add a warning to changing colors in the docs
Michael Jurka [Tue, 20 Sep 2011 21:13:53 +0000 (14:13 -0700)]
am
2d69cff8: Merge "Fix crash in recent apps" into ics-factoryrom
* commit '
2d69cff88e262569ac1284e2048f2a6c3aca6639':
Fix crash in recent apps
Daniel Sandler [Tue, 20 Sep 2011 21:13:51 +0000 (14:13 -0700)]
am
38cfcfbc: (-s ours) Merge "Fix MENU icon weirdness. (DO NOT MERGE)" into ics-factoryrom
* commit '
38cfcfbc327c7d9fb65ac6dcb1074927e445ce29':
Fix MENU icon weirdness. (DO NOT MERGE)
Daniel Sandler [Tue, 20 Sep 2011 21:13:48 +0000 (14:13 -0700)]
am
ee0835b9: (-s ours) Merge changes Ib49af35a,Iaa20454c into ics-factoryrom
* commit '
ee0835b95de225fdc34d45b777b4595d01727a40':
Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE)
Fix disappearing nav icons. (DO NOT MERGE)
JP Abgrall [Tue, 20 Sep 2011 21:13:36 +0000 (14:13 -0700)]
am
20e93c05: dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all
* commit '
20e93c0507b66e697d23c58c138484d652a1b810':
dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all
Mathias Agopian [Tue, 20 Sep 2011 21:02:53 +0000 (14:02 -0700)]
Merge "Make sure Region handles invalid rectangles"
Mathias Agopian [Tue, 20 Sep 2011 21:02:44 +0000 (14:02 -0700)]
Merge "fix the float Rect in OpenGLRenderer to handle NANs"
Matthew Xie [Tue, 20 Sep 2011 20:55:48 +0000 (13:55 -0700)]
Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom
Dianne Hackborn [Tue, 20 Sep 2011 19:37:10 +0000 (12:37 -0700)]
Merge "Fix issue #
5312624: Lock screen very flickery"
Justin Ho [Tue, 20 Sep 2011 19:09:13 +0000 (12:09 -0700)]
Merge "Updated lockscreen camera assets Bug:
5296921" into ics-factoryrom
Daniel Sandler [Tue, 20 Sep 2011 18:47:50 +0000 (11:47 -0700)]
Merge "More debug logs for RSSI updates." into ics-factoryrom
RoboErik [Tue, 20 Sep 2011 18:34:20 +0000 (11:34 -0700)]
Merge "Add a warning to changing colors in the docs" into ics-factoryrom
Eric Fischer [Tue, 20 Sep 2011 17:54:52 +0000 (10:54 -0700)]
Merge "Import revised translations."
Michael Jurka [Tue, 20 Sep 2011 17:49:48 +0000 (10:49 -0700)]
Merge "Fix crash in recent apps" into ics-factoryrom
Daniel Sandler [Tue, 20 Sep 2011 17:44:07 +0000 (10:44 -0700)]
Merge "Fix MENU icon weirdness. (DO NOT MERGE)" into ics-factoryrom
Ben Murdoch [Tue, 20 Sep 2011 17:32:28 +0000 (10:32 -0700)]
Merge "Cleanup for bug
5278763"
Daniel Sandler [Tue, 20 Sep 2011 17:25:11 +0000 (10:25 -0700)]
Merge changes Ib49af35a,Iaa20454c into ics-factoryrom
* changes:
Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE)
Fix disappearing nav icons. (DO NOT MERGE)
Justin Ho [Tue, 20 Sep 2011 16:57:48 +0000 (09:57 -0700)]
Merge "Reversal of indeterminate progressbar"
Chih-Chung Chang [Tue, 20 Sep 2011 16:23:34 +0000 (09:23 -0700)]
Merge "Fix
5224359: Add width and height to media store."
Daniel Sandler [Tue, 20 Sep 2011 14:47:45 +0000 (07:47 -0700)]
Merge "Fix disappearing nav icons."
Daniel Sandler [Tue, 20 Sep 2011 14:47:40 +0000 (07:47 -0700)]
Merge "Stop clobbering the systemUiVisibility on navbar touch."
The Android Open Source Project [Tue, 20 Sep 2011 14:43:10 +0000 (07:43 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252
The Android Automerger [Tue, 20 Sep 2011 13:28:15 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Jeff Sharkey [Tue, 20 Sep 2011 04:44:00 +0000 (21:44 -0700)]
am
88b18eb8: Merge "Upload correct txPackets count." into ics-factoryrom
* commit '
88b18eb8c2034e9de35482cc737ef8d608d55867':
Upload correct txPackets count.
Jeff Sharkey [Tue, 20 Sep 2011 04:42:13 +0000 (21:42 -0700)]
Merge "Upload correct txPackets count." into ics-factoryrom
James Dong [Tue, 20 Sep 2011 03:09:00 +0000 (20:09 -0700)]
am
92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
* commit '
92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
Add QVGA resolution to CamcorderProfile
James Dong [Tue, 20 Sep 2011 03:06:52 +0000 (20:06 -0700)]
Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
Peter Ng [Tue, 20 Sep 2011 02:01:58 +0000 (19:01 -0700)]
Merge "Keyguard padding fixes"
OSDN Git Service
