Romain Guy
e575005f7c
Merge "Update hardware acceleration doc"
2012-01-23 16:27:50 -08:00
Romain Guy
36d7549181
Update hardware acceleration doc
...
Change-Id: I3bed77b3c4e1eff96fa462e4849f25f38784c415
2012-01-23 16:26:46 -08:00
Jim Miller
d6aaff7f2e
am eda775cc: am 9f080e2a: am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread priority"" into ics-mr1
...
* commit 'eda775cc89b862e0637af132d78168e1b28820f8':
Revert "Fix 5797764: Increase lock screen's thread priority"
2012-01-23 15:55:18 -08:00
Jim Miller
eda775cc89
am 9f080e2a: am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread priority"" into ics-mr1
...
* commit '9f080e2a5bc6a268934e32201c69ea8a86900396':
Revert "Fix 5797764: Increase lock screen's thread priority"
2012-01-23 15:53:17 -08:00
Jim Miller
9f080e2a5b
am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread priority"" into ics-mr1
...
* commit '44760b106a4bafcf83fb356bf91683db40e0e5a2':
Revert "Fix 5797764: Increase lock screen's thread priority"
2012-01-23 15:51:23 -08:00
Jim Miller
44760b106a
Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ics-mr1
2012-01-23 15:49:32 -08:00
Fabrice Di Meglio
d9887b21c9
am 22cfd047: Merge "Fix bug #5846413 "phone" keyboard layout is broken on master"
...
* commit '22cfd047abb09929331ce2727499a24bcbb3604b':
Fix bug #5846413 "phone" keyboard layout is broken on master
2012-01-23 15:49:06 -08:00
Fabrice Di Meglio
22cfd047ab
Merge "Fix bug #5846413 "phone" keyboard layout is broken on master"
2012-01-23 15:46:58 -08:00
Romain Guy
20fa167aa3
am d215ddf3: Merge "Fix API typo"
...
* commit 'd215ddf3d95b0d009ea7fc50c0d36647ebaa1c14':
Fix API typo
2012-01-23 15:37:17 -08:00
Romain Guy
d215ddf3d9
Merge "Fix API typo"
2012-01-23 15:35:24 -08:00
Romain Guy
1e878d2ff5
Fix API typo
...
Change-Id: Iac6de947b0d550cc8dd4a3b5d88baa322c21bbb8
2012-01-23 15:34:25 -08:00
Jim Miller
54dbbce1c3
Revert "Fix 5797764: Increase lock screen's thread priority"
...
This reverts commit 6d6a70a33746ef5147ab146f1802f0db424dd2f1
This doesn't appear to have a measurable impact for this issue.
2012-01-23 15:24:42 -08:00
Justin Ho
b8ce91922e
am 5d76def6: am feb1d988: (-s ours) am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
...
* commit '5d76def68d135a4a0cf0a99a0fba7dad3e28c51a':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
2012-01-23 15:18:41 -08:00
Justin Ho
5d76def68d
am feb1d988: (-s ours) am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
...
* commit 'feb1d988c8ea1a67a4edbf1914ea41ea73519e12':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
2012-01-23 15:16:00 -08:00
Justin Ho
feb1d988c8
am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
...
* commit 'fee5a860a8355cda071ff23644e943414ba7f65d':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
2012-01-23 15:13:19 -08:00
Justin Ho
fee5a860a8
Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
2012-01-23 15:11:00 -08:00
Fabrice Di Meglio
0c95dd3f4f
Fix bug # 5863709 API request: Change param names of deleteSurroundingText to "before" and "after"
...
Change-Id: I727fad9a59cda915899674569bfabd29b9f5da60
2012-01-23 15:06:42 -08:00
John Reck
bbb97e47d1
am bc932579: Merge "Fix crash when scrolling a layer"
...
* commit 'bc932579ea35c6274c5a94c683c665a4d5bb3567':
Fix crash when scrolling a layer
2012-01-23 15:05:57 -08:00
John Reck
bc932579ea
Merge "Fix crash when scrolling a layer"
2012-01-23 15:04:13 -08:00
Justin Ho
b918035d34
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
...
This reverts commit 71c4496a9757438afd30b4404824f296f6158a49.
Change-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2
2012-01-23 15:02:41 -08:00
John Reck
7aa7ba1ce6
Fix crash when scrolling a layer
...
Change-Id: I6e61f3b38c5d1291ceb36c9dfa87fcd78480c2f4
2012-01-23 14:53:47 -08:00
Dianne Hackborn
eb22325ebd
am fc585157: Merge "New screen rotation animation design."
...
* commit 'fc5851579ad316cffcacf231c5c04bda47b4517f':
New screen rotation animation design.
2012-01-23 14:37:48 -08:00
Dianne Hackborn
fc5851579a
Merge "New screen rotation animation design."
2012-01-23 14:34:55 -08:00
Gilles Debunne
72882b2af9
am 39092421: Merge "Double tap to select enabled on suggestions"
...
* commit '3909242141d6735dbae96729716ccabaa9490fd5':
Double tap to select enabled on suggestions
2012-01-23 14:13:22 -08:00
Gilles Debunne
3909242141
Merge "Double tap to select enabled on suggestions"
2012-01-23 14:10:44 -08:00
Fabrice Di Meglio
bd901dee31
Fix bug #5846413 "phone" keyboard layout is broken on master
...
- was a subtle regression introduced when fixing bug #5753006
- as we are now using SkPaint::kGlyphID_TextEncoding (glyph encoding)
instead of SkPaint::kUTF16_TextEncoding (UTF16 encoding), we need to
force the UTF16 encoding in some cases that are NOT going thru
the TextLayoutCache / Harfbuzz shaping
- fix also breakText() the same way
- also clean some old comment
- Warning: depends also on a CL from Skia for having getBaseGlyphCount() "const"
Change-Id: I3d1fc87f070884876c679b33541f810fbfb5df3f
2012-01-23 13:34:08 -08:00
Jeff Brown
86de0590b9
Clean up content observer code.
...
Improved the documentation a little bit.
Fixed a bug in ContentService wherein if a ContentObserver was
passed as an argument and its deliverSelfNotifications() method
returned true, then notifyChange would tell all observers that
the change was a self-change even though it was only a self-change
from the perspective of the provided observer.
Deprecated ContentObservable.notifyChange since it is never
used and in general it shouldn't be because we want the notification
to be posted to the handler.
Change-Id: Idde49eb40777e011a068f2adae8a32f779dfb923
2012-01-23 13:01:18 -08:00
Dianne Hackborn
fd1c5ed370
New screen rotation animation design.
...
We now have an animation that can start as soon as we detect to
rotate the screen, and have a different phase once the new UI
is ready to complete the transition into it.
Change-Id: I05b9c12a699232acbddc36b4a994a4452db71476
2012-01-23 12:52:43 -08:00
Dianne Hackborn
b5fa9ccb15
am a6b8fe1c: Merge "New brightness setting to adjust auto-brightness mode."
...
* commit 'a6b8fe1c7115e0d3843cf6915f9a6f7598779530':
New brightness setting to adjust auto-brightness mode.
2012-01-23 12:37:36 -08:00
Dianne Hackborn
a6b8fe1c71
Merge "New brightness setting to adjust auto-brightness mode."
2012-01-23 12:36:19 -08:00
Wink Saville
ec0f836c49
am 5d6a095e: Merge "Do not clear good TLVs when a error occurs decoding."
...
* commit '5d6a095e65bc64b0a7aaa5d66ba60713f2d88cce':
Do not clear good TLVs when a error occurs decoding.
2012-01-23 12:25:14 -08:00
Andy McFadden
3f8a25fc52
am d71b9154: Merge "Don\'t use bootstrap loader directly"
...
* commit 'd71b9154daf796a03aebf2d38c60197cf77e0133':
Don't use bootstrap loader directly
2012-01-23 12:22:50 -08:00
Wink Saville
5d6a095e65
Merge "Do not clear good TLVs when a error occurs decoding."
2012-01-23 12:22:21 -08:00
Andy McFadden
d71b9154da
Merge "Don't use bootstrap loader directly"
2012-01-23 12:21:19 -08:00
Wink Saville
7c27ac64d5
Do not clear good TLVs when a error occurs decoding.
...
In change Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf with a sha1 of
e81932e92a773538e1ad1ad1d4bfd8f241860c8d it seemed like a good idea
to throw away all TLV's on errors. In retrospect that was probably
not a good idea. For example on the MTN Ghana SIM the error
occurs because of some 0 pad bytes at the end, all of the actual
TLV's are good, so throwing away everything is unreasonable. Instead
accepting what is valid seems a better approach.
Also, add a couple debug lines on error paths.
Change-Id: I4add0c9cd242f46e0ef8700229d0ec755b9e4c4c
2012-01-23 12:19:20 -08:00
Dianne Hackborn
d9ea468d6a
New brightness setting to adjust auto-brightness mode.
...
Change-Id: Icfec22be99d8c79e9ff5720b80fb9dacbba36134
2012-01-23 12:01:00 -08:00
Robert Greenwalt
7df80fa4e8
Use the carrier-given dns addrs for tethering.
...
This fixes a complaint from carriers (that we used 8.8.8.8), but also
fixes the case where there is only room for one live radio
connection: the secondary connection (tethering) doesn't have a
default route to prevent on-device traffic from slipping out on the
tethering connection, but tethered dns is proxied through dnsmasq, so
it is appearing as on-device traffic and is unroutable. By switching
to the carrier-indicated dns servers we can use the host-routes
already set for those and kill two bugs with one fix.
bug:5898904
Change-Id: Ida8777687994f353b2d4f2c7db5d6ea4b6ac3882
2012-01-23 11:29:37 -08:00
Bill Gruber
df5e0dd2bd
am cf5c78f2: am add87f99: am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
...
* commit 'cf5c78f209a34bae4a049ff2370252be8598d034':
DevDocs update: Publishing on Market
2012-01-23 10:44:22 -08:00
The Android Open Source Project
04c699c438
am 8a6b2832: am 961b1df3: Reconcile with ics-mr1-release
...
* commit '8a6b2832a954233e74617e1680829c4216ef2737':
Fix 5797764: Increase lock screen's thread priority
2012-01-23 10:44:20 -08:00
Bill Gruber
cf5c78f209
am add87f99: am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
...
* commit 'add87f99d9ece26c776abe40297e9a49e08932d9':
DevDocs update: Publishing on Market
2012-01-23 10:41:43 -08:00
The Android Open Source Project
8a6b2832a9
am 961b1df3: Reconcile with ics-mr1-release
...
* commit '961b1df3fcbf5c441555b69ac52a5aed7f91a94e':
Fix 5797764: Increase lock screen's thread priority
2012-01-23 10:41:37 -08:00
Bill Gruber
add87f99d9
am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
...
* commit '5e5b57aef29b33d03965b4dc370cde9a39220adc':
DevDocs update: Publishing on Market
2012-01-23 10:23:10 -08:00
Bill Gruber
5e5b57aef2
Merge "DevDocs update: Publishing on Market" into ics-mr1
2012-01-23 10:21:16 -08:00
The Android Open Source Project
961b1df3fc
Reconcile with ics-mr1-release
...
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
2012-01-23 10:15:41 -08:00
Andy McFadden
dc7bf5d8bf
Don't use bootstrap loader directly
...
The VM is allowed to use null to represent the bootstrap class
loader, so attempting to call methods on it is a bad idea. Use
the system class loader instead.
Change-Id: I9190848945f679d546d5fb30aba10fd27c7e5404
2012-01-23 09:51:42 -08:00
Andy McFadden
7f2ea934b5
am 30f1312b: Merge "Use Map.Entry, not HashMap.Entry"
...
* commit '30f1312b3cb584c14eba60e6809d4eeed5d906bf':
Use Map.Entry, not HashMap.Entry
2012-01-23 09:36:02 -08:00
Andy McFadden
30f1312b3c
Merge "Use Map.Entry, not HashMap.Entry"
2012-01-23 09:34:17 -08:00
Jim Miller
8021552c6b
am 8ffd2ccc: am b1c7785c: am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1
...
* commit '8ffd2cccf0f0458b941d2a3c69d30a6ae06fc33b':
Fix 5797764: Increase lock screen's thread priority
2012-01-23 09:23:24 -08:00
Justin Ho
19267b1079
am 5691f6a8: am e46f8696: am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1
...
* commit '5691f6a882528a5a2b622eeed335d256d15a7f05':
Update WiMAX assets to match new style Bug: 5724605
2012-01-23 09:23:21 -08:00
Daniel Sandler
3c2fcef9ff
am e08c3e15: am aaa7b772: am 639ed754: Hide mobile RSSI on devices without mobile data.
...
* commit 'e08c3e152085193a3a87fe8373af1149904642b8':
Hide mobile RSSI on devices without mobile data.
2012-01-23 09:23:18 -08:00