satok
6965ec5295
Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1
2011-10-26 13:14:36 -07:00
Eric Fischer
621ac4218d
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-10-26 11:32:07 -07:00
Svetoslav Ganov
afcb08cd0a
Merge "Adding accessibility support to the tablet swipe unlock." into ics-mr1
2011-10-26 11:30:06 -07:00
Bart Sears
e0ba5920d0
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
2011-10-26 12:22:44 +00:00
Dianne Hackborn
d5003fc3f9
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
2011-10-26 12:22:31 +00:00
Justin Ho
3fcf257386
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
2011-10-26 11:47:08 +00:00
Bart Sears
40959b0122
Merge "Fix power key handling after volume change. Bug: 5497716" into ics-mr0
2011-10-26 00:08:59 -07:00
Dianne Hackborn
3ae7176c92
Merge "Fix issue #5508024 : Rotation jank seen in live wallpapers" into ics-mr0
2011-10-25 15:25:21 -07:00
Justin Ho
56568b83b7
Merge "Update Prime keyboard feedback sounds Tune notification sound Hojus Bug: 5416299" into ics-mr0
2011-10-25 14:28:29 -07:00
Ed Heyl
c36fb99baa
merge ics-mr0
...
Change-Id: I4f0b2bb1b1136c9467e9d55f57f5333153cae65d
2011-10-25 20:47:51 +00:00
satok
b49a14e180
Merge "Fix a bug where surface crashes when the enter animation starts while the exit animation has not yet finished" into ics-mr1
2011-10-25 10:48:23 -07:00
Mike Lockwood
08f8340261
Merge "Reset cached light sensor values when toggling auto-brightness mode" into ics-mr0
2011-10-25 07:02:52 -07:00
Mike Lockwood
5455503807
Merge "Revert "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled."" into ics-mr0
2011-10-25 07:02:45 -07:00
Roman Nurik
e319debaae
Merge "Add Q3 2011 ADL slides to docs/shareables/adl" into ics-mr0
2011-10-25 06:55:59 -07:00
Mike Lockwood
9db0cd66b2
Merge "Always use fresh NTP time for GPS" into ics-mr0
2011-10-25 06:51:28 -07:00
Brian Colonna
475a9fd6aa
Merge "Fix 5479823: black patch was showing before resuming call" into ics-mr0
2011-10-25 05:43:37 -07:00
Fred Quintana
9adb59f7ac
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
2011-10-24 20:36:30 -07:00
Eric Fischer
b0f5300356
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-24 16:59:41 -07:00
Scott Main
ac1fc6a492
Merge "docs: remove links to ADP devices" into ics-mr0
2011-10-24 16:47:49 -07:00
Jim Miller
54450b52d3
Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
2011-10-24 13:31:15 -07:00
Xavier Ducrohet
c9c85fb2d2
CherryPick f9e455 from master to mr0. do not merge.
...
Fix software GL renderer.
Change-Id: I7273a8e65c23a0032d155ea6572de2923791e411
2011-10-24 13:29:26 -07:00
Brian Colonna
d4f3e054e0
Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
2011-10-24 13:19:55 -07:00
The Android Open Source Project
754112477f
Reconcile with ics-mr0-release
...
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
2011-10-24 06:32:19 -07:00
The Android Automerger
1e0ed9d640
merge in ics-mr0-release history after reset to ics-mr0
2011-10-21 23:22:41 -07:00
Jake Hamby
f17f5a24c7
Merge "Add support for SMS-PP data download to USIM."
2011-10-21 17:04:15 -07:00
Mathias Agopian
0ef47a6a15
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
2011-10-21 17:04:05 -07:00
Peter Ng
f1b1ee1eb2
am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0
...
* commit 'be25d5b05639c8475b7faf312959923db86efa5d':
Do not merge - Recents background protection increased
2011-10-21 16:45:23 -07:00
Peter Ng
724e6d05eb
Merge "Do not merge - Recents background protection increased" into ics-mr0
2011-10-21 16:42:49 -07:00
John Reck
231c43a7b2
Merge "Fix rebuildWebTextView issues"
2011-10-21 16:35:50 -07:00
Xavier Ducrohet
7f6aec0185
Merge "Fix software GL renderer."
2011-10-21 16:22:15 -07:00
Xavier Ducrohet
4c4163b53e
Fix software GL renderer.
...
Change-Id: I07ab2709fa694e41aa3fcc5b9dfc809f55853ab4
2011-10-21 16:18:48 -07:00
Mathias Agopian
51726c381e
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
2011-10-21 16:00:00 -07:00
Eric Fischer
3d62b42d64
am 148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '148d5bd855e4872bbe99870b0019462bcf73b72c':
Import revised translations. DO NOT MERGE
2011-10-21 15:57:54 -07:00
Mathias Agopian
239c049108
Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
2011-10-21 15:57:45 -07:00
Eric Fischer
482346aec3
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-21 15:56:22 -07:00
The Android Automerger
69bd1e50f8
merge in ics-mr0-release history after reset to ics-mr0
2011-10-21 15:55:40 -07:00
Mathias Agopian
0dfb7b73a4
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
2011-10-21 15:41:01 -07:00
Daniel Shiplacoff
28e30beef8
Merge "Recents background protection increased"
2011-10-21 15:22:54 -07:00
John Reck
b6f5ebd0a4
am 8bf89f30: (-s ours) Fix the build
...
* commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
Fix the build
2011-10-21 15:22:11 -07:00
Adam Cohen
2b9b071810
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
2011-10-21 14:38:41 -07:00
John Reck
888a37534f
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.
2011-10-21 14:38:32 -07:00
Dianne Hackborn
6fe0208494
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...
2011-10-21 14:38:31 -07:00
Dirk Dougherty
7978457c29
am f1ed59bc: Merge "Doc change: fix typo in platform highlights." into ics-mr0
...
* commit 'f1ed59bcebfd3042aead8d91ee47eca38af543c6':
Doc change: fix typo in platform highlights.
2011-10-21 13:59:34 -07:00
Winson Chung
3abb9fc2ee
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)
2011-10-21 13:59:08 -07:00
Dianne Hackborn
bfdb57b6ca
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
2011-10-21 13:59:07 -07:00
Mike Lockwood
2775ddf89a
am 6b6bfb18: Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
...
* commit '6b6bfb187412e4845c89d866eff0b87b6d0a5541':
PowerManagerService: Enable light sensor debug output
2011-10-21 13:59:05 -07:00
Gilles Debunne
93245acf5e
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
2011-10-21 13:59:04 -07:00
Eric Fischer
f0fcd8acdf
am 4e7ce935: (-s ours) Merge "Import revised translations." into ics-mr0
...
* commit '4e7ce9352b9c3a832715ac4b8014b2434a447172':
Import revised translations.
2011-10-21 13:59:03 -07:00
Adam Cohen
f91a2f070a
Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
2011-10-21 13:34:46 -07:00
Peter Ng
86079cdbff
Merge "Sharpening text edit assets"
2011-10-21 13:29:52 -07:00