Commit Graph

40019 Commits

Author SHA1 Message Date
Robert Ly
945a9bd920 am 37f4310d: fix build
* commit '37f4310d4af51fe6e2e35d27b9375a31fc98c803':
  fix build
2011-10-26 22:15:20 +00:00
Justin Ho
436e15eac9 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
2011-10-26 22:15:19 +00:00
Svetoslav Ganov
c9a582dd04 Merge "NumberPicker does not not fit on Crespo in landscape." into ics-mr1 2011-10-26 14:49:29 -07:00
Svetoslav Ganov
7b4374c416 Merge "AccessibilityNodeInfo makes incorrect check before calling into the system." into ics-mr1 2011-10-26 14:47:49 -07:00
Justin Ho
19a93e688c Merge "Adding alternate sound set and corresponding mk file Bug: 5502770" into ics-mr0 2011-10-26 14:46:15 -07:00
Justin Ho
753759feba am 650c052a: Merge "Notification icons increased opaqueness by 10%" into ics-mr0
* commit '650c052aa38447c363163126afffb16f314bbb11':
  Notification icons increased opaqueness by 10%
2011-10-26 21:39:28 +00:00
Justin Ho
5e496f4782 Merge "Notification icons increased opaqueness by 10%" into ics-mr0 2011-10-26 14:37:43 -07:00
Eric Fischer
41dead8281 am e2afc5bd: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit 'e2afc5bd243e60bdc168ca30284607230fe646f8':
  Import revised translations.  DO NOT MERGE
2011-10-26 21:06:36 +00:00
Eric Fischer
7bc5a18eb8 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-26 14:04:35 -07:00
Robert Ly
0d693130a6 am 576ea5eb: Merge "docs: tools/adt r15 rel notes" into ics-mr0
* commit '576ea5eb919bc944367b7bc7aeb7d02f6d715088':
  docs: tools/adt r15 rel notes
2011-10-26 20:52:37 +00:00
Robert Ly
603a87ced4 Merge "docs: tools/adt r15 rel notes" into ics-mr0 2011-10-26 13:50:28 -07:00
Jamie Gennis
cd43e6da12 am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
* commit 'b7b4eaaa05284634d50d581d924a250f1194f66d':
  Stagefright: push blank buffers when tearing down
2011-10-26 20:34:38 +00:00
Jamie Gennis
c3762f76a9 Merge "Stagefright: push blank buffers when tearing down" into ics-mr0 2011-10-26 13:33:16 -07:00
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