Justin Ho
087ea1b227
am 44e10f0a: am 7901a2c3: Merge "Adding alternate sound set and corresponding mk file Bug: 5502770" into ics-mr0
...
* commit '44e10f0add63ee2c75a0039aac105ecba5b2360c':
Adding alternate sound set and corresponding mk file Bug: 5502770
2011-10-26 22:35:28 +00:00
Justin Ho
dc1d885844
am 9894c862: Adding alternate sound set and corresponding mk file Bug: 5502770
...
* commit '9894c862db04955794471bcb13ed1068d4886536':
Adding alternate sound set and corresponding mk file Bug: 5502770
2011-10-26 22:35:26 +00:00
Svetoslav Ganov
e38ac4fe6d
am 8c807076: Merge "NumberPicker does not not fit on Crespo in landscape." into ics-mr1
...
* commit '8c8070763971b72aa012e23585fe844b4b956282':
NumberPicker does not not fit on Crespo in landscape.
2011-10-26 22:35:22 +00:00
Svetoslav Ganov
c5782b969d
resolved conflicts for merge of b0267e28 to master
...
Change-Id: Ic65ab83958b2e6bb941fe015b557fd2fd8f80683
2011-10-26 15:29:26 -07: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
42f4f26fe6
am 733442e3: am 650c052a: Merge "Notification icons increased opaqueness by 10%" into ics-mr0
...
* commit '733442e33ab20c04fe115d295e2b74967e8e448d':
Notification icons increased opaqueness by 10%
2011-10-26 21:43:00 +00: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
78cab6b50d
am aa3c9b16: (-s ours) am e2afc5bd: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit 'aa3c9b167421a8862fae82ba0a758ee3e27bc5e7':
Import revised translations. DO NOT MERGE
2011-10-26 21:12:34 +00: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
69530983af
am ab1ac94e: am 576ea5eb: Merge "docs: tools/adt r15 rel notes" into ics-mr0
...
* commit 'ab1ac94e7336ba7a40d06573a22da23974f3923b':
docs: tools/adt r15 rel notes
2011-10-26 20:56:20 +00: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
5238af45bb
am 5ded5fc5: am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
...
* commit '5ded5fc55f2da2af0a76a9ddc52d27948b227037':
Stagefright: push blank buffers when tearing down
2011-10-26 20:39:25 +00: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
b45a9027d9
am 6f444425: Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1
...
* commit '6f444425fe1bb62e12973c5df6a3161bc2aa2ce7':
Make FLAG_AUTO_CORRECTION public
2011-10-26 20:18:19 +00:00
satok
6965ec5295
Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1
2011-10-26 13:14:36 -07:00
Mathias Agopian
7796e962da
Merge "Rename SensorChannel to BitTube"
2011-10-26 12:51:44 -07:00
Eric Fischer
0777571e74
am 08d0f642: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '08d0f6420ac439265e9b4086c931173b44409c51':
Import revised translations. DO NOT MERGE
2011-10-26 18:36:40 +00:00
Svetoslav Ganov
2cd0483103
am 1a3ad7d1: Merge "Adding accessibility support to the tablet swipe unlock." into ics-mr1
...
* commit '1a3ad7d18f0e15611268347da7f1b5db8c3b558d':
Adding accessibility support to the tablet swipe unlock.
2011-10-26 18:34:25 +00: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
Philip Milne
cdaf207061
Merge " Update to fix for bug 5393156"
2011-10-26 10:18:30 -07:00
Irfan Sheriff
77d5b7e60b
Merge "Switch to notifications for walled garden"
2011-10-26 09:49:33 -07:00
Bart Sears
2e0577aad0
am 6e03b220: am d887377a: Merge "Fix power key handling after volume change. Bug: 5497716" into ics-mr0
...
* commit '6e03b22015bd834da1a5755e75d7468e5b3b13c5':
Fix power key handling after volume change. Bug: 5497716
2011-10-26 14:25:27 +00:00
Dianne Hackborn
31cb9aee92
am c6592d2e: am 67a1b7d6: Merge "Fix issue #5508024 : Rotation jank seen in live wallpapers" into ics-mr0
...
* commit 'c6592d2eb808befedc3d9c842b61e21cc6bedbf3':
Fix issue #5508024 : Rotation jank seen in live wallpapers
2011-10-26 14:25:25 +00:00
Justin Ho
7421d1af61
am 7acd70f1: am 1f182af9: Merge "Update Prime keyboard feedback sounds Tune notification sound Hojus Bug: 5416299" into ics-mr0
...
* commit '7acd70f180d15e6da80d137d7cf0730e11dbd472':
Update Prime keyboard feedback sounds Tune notification sound Hojus Bug: 5416299
2011-10-26 14:25:24 +00:00
Ed Heyl
2b0b62d027
am e49cf107: (-s ours) merge ics-mr0
...
* commit 'e49cf107e2533b7ca71c500bc20a0f6dcdf9efdc':
Updated Roboto font Bugs: 5462847, 5497556, 5502610
Always use fresh NTP time for GPS
Reset cached light sensor values when toggling auto-brightness mode
Revert "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled."
Fix 5479823: black patch was showing before resuming call
Add Q3 2011 ADL slides to docs/shareables/adl
2011-10-26 14:25:23 +00:00
satok
12db4b79e2
am 1bfe6e95: Merge "Fix a bug where surface crashes when the enter animation starts while the exit animation has not yet finished" into ics-mr1
...
* commit '1bfe6e95a175b45ee68921e3ffe2571b222864bf':
Fix a bug where surface crashes when the enter animation starts while the exit animation has not yet finished
2011-10-26 14:23:04 +00: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
Steve Block
6807e59e0f
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
2011-10-26 09:57:54 +01: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
Peter Ng
e438db9e6a
Merge "Convert the outer lockscreen ring to a shape drawable."
2011-10-25 16:33:24 -07:00
Gilles Debunne
f835c99f94
Merge "Text handles do not handle scroll correctly"
2011-10-25 15:54:51 -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
Eric Fischer
8d0ec029e6
Merge "Import revised translations."
2011-10-25 11:42:28 -07: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
Steve Block
9f760150f6
Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE
...
See https://android-git.corp.google.com/g/#/c/141576
Bug: 5449033
Change-Id: I42575e7c29cf1c0f465c357a5c97ab118df6f473
2011-10-25 16:28:24 +01: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