OSDN Git Service
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
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
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
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
Bart Sears [Wed, 26 Oct 2011 12:22:44 +0000 (12:22 +0000)]
am
d887377a: Merge "Fix power key handling after volume change. Bug:
5497716" into ics-mr0
* commit '
d887377aa84f0d422cf605dad981f8dc53c0f99f':
Fix power key handling after volume change. Bug:
5497716
Dianne Hackborn [Wed, 26 Oct 2011 12:22:31 +0000 (12:22 +0000)]
am
67a1b7d6: Merge "Fix issue #
5508024: Rotation jank seen in live wallpapers" into ics-mr0
* commit '
67a1b7d6e5857d0ecdd1aa9d50d10189e5776c11':
Fix issue #
5508024: Rotation jank seen in live wallpapers
Justin Ho [Wed, 26 Oct 2011 11:47:08 +0000 (11:47 +0000)]
am
1f182af9: Merge "Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299" into ics-mr0
* commit '
1f182af915164b72582e7ee669f125f7553857ac':
Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299
Bart Sears [Wed, 26 Oct 2011 07:08:59 +0000 (00:08 -0700)]
Merge "Fix power key handling after volume change. Bug:
5497716" into ics-mr0
Dianne Hackborn [Tue, 25 Oct 2011 22:25:21 +0000 (15:25 -0700)]
Merge "Fix issue #
5508024: Rotation jank seen in live wallpapers" into ics-mr0
Justin Ho [Tue, 25 Oct 2011 21:28:29 +0000 (14:28 -0700)]
Merge "Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299" into ics-mr0
Ed Heyl [Tue, 25 Oct 2011 20:47:51 +0000 (20:47 +0000)]
merge ics-mr0
Change-Id: I4f0b2bb1b1136c9467e9d55f57f5333153cae65d
satok [Tue, 25 Oct 2011 17:48:23 +0000 (10:48 -0700)]
Merge "Fix a bug where surface crashes when the enter animation starts while the exit animation has not yet finished" into ics-mr1
Mike Lockwood [Tue, 25 Oct 2011 14:02:52 +0000 (07:02 -0700)]
Merge "Reset cached light sensor values when toggling auto-brightness mode" into ics-mr0
Mike Lockwood [Tue, 25 Oct 2011 14:02:45 +0000 (07:02 -0700)]
Merge "Revert "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled."" into ics-mr0
Roman Nurik [Tue, 25 Oct 2011 13:55:59 +0000 (06:55 -0700)]
Merge "Add Q3 2011 ADL slides to docs/shareables/adl" into ics-mr0
Mike Lockwood [Tue, 25 Oct 2011 13:51:28 +0000 (06:51 -0700)]
Merge "Always use fresh NTP time for GPS" into ics-mr0
Brian Colonna [Tue, 25 Oct 2011 12:43:37 +0000 (05:43 -0700)]
Merge "Fix
5479823: black patch was showing before resuming call" into ics-mr0
Fred Quintana [Tue, 25 Oct 2011 03:36:30 +0000 (20:36 -0700)]
Merge "Fixed a bug that causes AccountManager calls to hang forever, eventually exhausting the binder threads in the gapps process, making it unusable." into ics-mr0
Eric Fischer [Mon, 24 Oct 2011 23:59:41 +0000 (16:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Scott Main [Mon, 24 Oct 2011 23:47:49 +0000 (16:47 -0700)]
Merge "docs: remove links to ADP devices" into ics-mr0
Jim Miller [Mon, 24 Oct 2011 20:31:15 +0000 (13:31 -0700)]
Merge "Fix
3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
Xavier Ducrohet [Fri, 21 Oct 2011 23:18:48 +0000 (16:18 -0700)]
CherryPick f9e455 from master to mr0. do not merge.
Fix software GL renderer.
Change-Id: I7273a8e65c23a0032d155ea6572de2923791e411
Brian Colonna [Mon, 24 Oct 2011 20:19:55 +0000 (13:19 -0700)]
Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
The Android Open Source Project [Mon, 24 Oct 2011 13:32:19 +0000 (06:32 -0700)]
Reconcile with ics-mr0-release
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
The Android Automerger [Sat, 22 Oct 2011 06:22:41 +0000 (23:22 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jake Hamby [Sat, 22 Oct 2011 00:04:15 +0000 (17:04 -0700)]
Merge "Add support for SMS-PP data download to USIM."
Mathias Agopian [Fri, 21 Oct 2011 22:18:28 +0000 (15:18 -0700)]
mDirtyRegion is single threaded, but could be accessed from a hwc thread
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.
Bug:
5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
Peter Ng [Fri, 21 Oct 2011 23:45:23 +0000 (16:45 -0700)]
am
be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0
* commit '
be25d5b05639c8475b7faf312959923db86efa5d':
Do not merge - Recents background protection increased
Peter Ng [Fri, 21 Oct 2011 23:42:49 +0000 (16:42 -0700)]
Merge "Do not merge - Recents background protection increased" into ics-mr0
John Reck [Fri, 21 Oct 2011 23:35:50 +0000 (16:35 -0700)]
Merge "Fix rebuildWebTextView issues"
Xavier Ducrohet [Fri, 21 Oct 2011 23:22:15 +0000 (16:22 -0700)]
Merge "Fix software GL renderer."
Xavier Ducrohet [Fri, 21 Oct 2011 23:18:48 +0000 (16:18 -0700)]
Fix software GL renderer.
Change-Id: I07ab2709fa694e41aa3fcc5b9dfc809f55853ab4
Mathias Agopian [Fri, 21 Oct 2011 23:00:00 +0000 (16:00 -0700)]
am
aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
* commit '
aa938c8d9c0e71c9b556657cb33794210ce6ebf8':
mDirtyRegion is single threaded, but could be accessed from a hwc thread
Eric Fischer [Fri, 21 Oct 2011 22:57:54 +0000 (15:57 -0700)]
am
148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
148d5bd855e4872bbe99870b0019462bcf73b72c':
Import revised translations. DO NOT MERGE
Mathias Agopian [Fri, 21 Oct 2011 22:57:45 +0000 (15:57 -0700)]
Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 22:56:22 +0000 (15:56 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
The Android Automerger [Fri, 21 Oct 2011 22:55:40 +0000 (15:55 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Mathias Agopian [Fri, 21 Oct 2011 22:18:28 +0000 (15:18 -0700)]
mDirtyRegion is single threaded, but could be accessed from a hwc thread
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.
Bug:
5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
Daniel Shiplacoff [Fri, 21 Oct 2011 22:22:54 +0000 (15:22 -0700)]
Merge "Recents background protection increased"
John Reck [Fri, 21 Oct 2011 22:22:11 +0000 (15:22 -0700)]
am
8bf89f30: (-s ours) Fix the build
* commit '
8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
Fix the build
Adam Cohen [Fri, 21 Oct 2011 21:38:41 +0000 (14:38 -0700)]
am
e3bb0ecb: Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
* commit '
e3bb0ecb2b36964cb3b02bc0d575e9366818ee00':
Removing fades on last item in StackView for major FPS improvement on Prime
John Reck [Fri, 21 Oct 2011 21:38:32 +0000 (14:38 -0700)]
am
2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0
* commit '
2dd2e5b4eb95280bb18717c1a31ca8db40a6413b':
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
Dianne Hackborn [Fri, 21 Oct 2011 21:38:31 +0000 (14:38 -0700)]
am
943da7b8: Merge "Fix issue #
5342788: Setting wallpaper from gallery set default..." into ics-mr0
* commit '
943da7b895b7cc69cdaed7979cff422a7dbaac19':
Fix issue #
5342788: Setting wallpaper from gallery set default...
Dirk Dougherty [Fri, 21 Oct 2011 20:59:34 +0000 (13:59 -0700)]
am
f1ed59bc: Merge "Doc change: fix typo in platform highlights." into ics-mr0
* commit '
f1ed59bcebfd3042aead8d91ee47eca38af543c6':
Doc change: fix typo in platform highlights.
Winson Chung [Fri, 21 Oct 2011 20:59:08 +0000 (13:59 -0700)]
am
53a1b82c: Merge "Last update for screenshot animations for MR0. (Bug:
5333706)" into ics-mr0
* commit '
53a1b82c9a2133c5c3184898335fce0826279691':
Last update for screenshot animations for MR0. (Bug:
5333706)
Dianne Hackborn [Fri, 21 Oct 2011 20:59:07 +0000 (13:59 -0700)]
am
4bbd71a6: Merge "Fix issue #
5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0
* commit '
4bbd71a6b2f4957f4778da13861ec03d30afbee7':
Fix issue #
5228934: IME shows up on boot, or when digits screen is tapped
Mike Lockwood [Fri, 21 Oct 2011 20:59:05 +0000 (13:59 -0700)]
am
6b6bfb18: Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
* commit '
6b6bfb187412e4845c89d866eff0b87b6d0a5541':
PowerManagerService: Enable light sensor debug output
Gilles Debunne [Fri, 21 Oct 2011 20:59:04 +0000 (13:59 -0700)]
am
0499f90a: Merge "Bug
5428541: Check that span is still in text before deleting" into ics-mr0
* commit '
0499f90a2d2774f28ca3d430dfe563391669c515':
Bug
5428541: Check that span is still in text before deleting
Eric Fischer [Fri, 21 Oct 2011 20:59:03 +0000 (13:59 -0700)]
am
4e7ce935: (-s ours) Merge "Import revised translations." into ics-mr0
* commit '
4e7ce9352b9c3a832715ac4b8014b2434a447172':
Import revised translations.
Adam Cohen [Fri, 21 Oct 2011 20:34:46 +0000 (13:34 -0700)]
Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
Peter Ng [Fri, 21 Oct 2011 20:29:52 +0000 (13:29 -0700)]
Merge "Sharpening text edit assets"
George Mount [Fri, 21 Oct 2011 20:02:05 +0000 (13:02 -0700)]
Merge "Fixed spell check failing to change word."
RoboErik [Fri, 21 Oct 2011 20:01:56 +0000 (13:01 -0700)]
Merge "s/should/can"
John Reck [Fri, 21 Oct 2011 20:01:48 +0000 (13:01 -0700)]
Merge changes I2df047b6,I791eeb3c into ics-mr0
* changes:
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
Mangesh Ghiware [Fri, 21 Oct 2011 19:45:30 +0000 (12:45 -0700)]
Merge "Fix issue#
5492404: Reading level check thread error."
Dianne Hackborn [Fri, 21 Oct 2011 19:45:07 +0000 (12:45 -0700)]
Merge "Fix issue #
5342788: Setting wallpaper from gallery set default..." into ics-mr0
Dirk Dougherty [Fri, 21 Oct 2011 18:55:21 +0000 (11:55 -0700)]
Merge "Doc change: fix typo in platform highlights." into ics-mr0
Winson Chung [Fri, 21 Oct 2011 18:07:06 +0000 (11:07 -0700)]
Merge "Last update for screenshot animations for MR0. (Bug:
5333706)" into ics-mr0
Dianne Hackborn [Fri, 21 Oct 2011 18:03:34 +0000 (11:03 -0700)]
Merge "Fix issue #
5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0
RoboErik [Fri, 21 Oct 2011 18:00:40 +0000 (11:00 -0700)]
Merge "Color API comment updates."
Mike Lockwood [Fri, 21 Oct 2011 17:26:55 +0000 (10:26 -0700)]
Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
Gilles Debunne [Fri, 21 Oct 2011 16:48:07 +0000 (09:48 -0700)]
Merge "Bug
5428541: Check that span is still in text before deleting" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 16:34:22 +0000 (09:34 -0700)]
Merge "Import revised translations." into ics-mr0