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
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
ae83b8ee9b
am 763480fb: 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
...
* commit '763480fbcabedfc2f425484ed74bc1e2e1392176':
Fixed a bug that causes AccountManager calls to hang forever, eventually exhausting the binder threads in the gapps process, making it unusable.
2011-10-24 20:39:44 -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
The Android Open Source Project
c4c3c8b20e
Reconcile with ics-mr0-release
...
Change-Id: I73df979432604dda0d826d90e4b0bec6b174e0b8
2011-10-24 17:16:23 -07:00
Peter Ng
32380878c5
Merge "tablet unlock ring and wave updated for ics"
2011-10-24 17:03:40 -07:00
Eric Fischer
a19d7644c2
am 5657b739: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '5657b7399eb94429a8cc00ad9f79eaad0c26b93b':
Import revised translations. DO NOT MERGE
2011-10-24 17:01:36 -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
f35496a820
am 057e85ac: Merge "docs: remove links to ADP devices" into ics-mr0
...
* commit '057e85ac0b055e45cfec0e04da3d82c36918af78':
docs: remove links to ADP devices
2011-10-24 16:50:12 -07:00
Scott Main
ac1fc6a492
Merge "docs: remove links to ADP devices" into ics-mr0
2011-10-24 16:47:49 -07:00
Claudia de Veaux
e9135e9ed6
Merge "String scrub to implement punc, wording, cap standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"
2011-10-24 15:35:34 -07:00
Jeff Brown
93a4a7f088
Merge "Use libcorkscrew for stack unwinding."
2011-10-24 15:13:13 -07:00
The Android Automerger
63fcce607b
merge in ics-mr0-release history after reset to ics-mr0
2011-10-24 14:55:08 -07:00
Jim Miller
d706882f07
am 7a962fef: Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
...
* commit '7a962fef2f26b941b916595562d5adfae943d432':
Fix 3384942: Force ASCII-capable IME to show on lockscreen
2011-10-24 13:32:31 -07:00
Xavier Ducrohet
f2ec33a777
am e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.
...
* commit 'e869ca9626146265bbb2b5043018dfe532e0661f':
CherryPick f9e455 from master to mr0. do not merge.
2011-10-24 13:32:30 -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
32c1a95f18
am c9c417c8: Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
...
* commit 'c9c417c85d08074e5ececd5c74db1364e9c097c2':
Added callback to allow Face Unlock to hide black area
2011-10-24 13:22:13 -07:00
Xavier Ducrohet
e33558752f
am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.
...
* commit 'b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee':
CherryPick 35530d from master to mr0. do not merge.
2011-10-24 13:20:07 -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
Xavier Ducrohet
d58d3c281b
Merge "qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys."
2011-10-24 13:01:46 -07:00
The Android Automerger
8da46bf97b
merge in ics-mr0-release history after reset to ics-mr0
2011-10-24 12:56:26 -07:00
Scott Main
3a212f57f0
am 084369fb: docs: add uiOptions attribute to manifest docs
...
* commit '084369fb5e738e4db6ae94b4e24e777bdd9d9c2c':
docs: add uiOptions attribute to manifest docs
2011-10-24 12:46:39 -07:00
Wink Saville
312552da15
am cd3ec73f: Add getAvailableNetworks.
...
* commit 'cd3ec73f0ce164c718146bc1dbb7c430763be25a':
Add getAvailableNetworks.
2011-10-24 12:46:21 -07:00
Svetoslav Ganov
79469f5d93
Merge "Adding APIs to enable reporting virtual view hierarchies to accessibility serivces."
2011-10-24 12:05:38 -07:00
Peter Ng
1b839b1cea
Merge "Stat notify image update"
2011-10-24 10:55:30 -07:00
The Android Open Source Project
754112477f
Reconcile with ics-mr0-release
...
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
2011-10-24 06:32:19 -07:00