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
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
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
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
Justin Ho
acedb0a078
am 9b4b3787: am ffb0c0b3: am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1
...
* commit '9b4b378777e00012449d904f342adc3be09437a7':
New out-of-service RSSI.
2012-01-23 09:23:15 -08:00
Jim Miller
8ffd2cccf0
am b1c7785c: am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1
...
* commit 'b1c7785c1110e171d3dd3deb259b1caeed0b9da6':
Fix 5797764: Increase lock screen's thread priority
2012-01-23 09:18:36 -08:00
Justin Ho
5691f6a882
am e46f8696: am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1
...
* commit 'e46f869629ef27afb149c771e69dbbefe1135f33':
Update WiMAX assets to match new style Bug: 5724605
2012-01-23 09:18:30 -08:00
Daniel Sandler
e08c3e1520
am aaa7b772: am 639ed754: Hide mobile RSSI on devices without mobile data.
...
* commit 'aaa7b7728f3ced062273b54e1fc3b9d7d815bdcd':
Hide mobile RSSI on devices without mobile data.
2012-01-23 09:18:24 -08:00
Justin Ho
9b4b378777
am ffb0c0b3: am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1
...
* commit 'ffb0c0b3ca2f8693a354aad17e21f1419d9f0379':
New out-of-service RSSI.
2012-01-23 09:18:20 -08:00
George Mount
c77af3bc8e
am 699ed800: Merge "Add cut and paste to ContentEditable."
...
* commit '699ed8003877e14c72944461e5143e807e183558':
Add cut and paste to ContentEditable.
2012-01-23 07:32:27 -08:00
George Mount
699ed80038
Merge "Add cut and paste to ContentEditable."
2012-01-23 07:30:26 -08:00
Michael Jurka
7c83a34d9e
am 5a89672f: Merge "Remove fastInvalidate and setFast* methods"
...
* commit '5a89672f3ef0781f0c28e63ee774970340dbb4dd':
Remove fastInvalidate and setFast* methods
2012-01-23 07:28:07 -08:00
Michael Jurka
e9bcd1a007
am 5274d6f1: Merge "Improve rapid-fire presses on system bar"
...
* commit '5274d6f115e8c3fda053a0fd4b4009ab15790191':
Improve rapid-fire presses on system bar
2012-01-23 07:25:47 -08:00
Michael Jurka
5a89672f3e
Merge "Remove fastInvalidate and setFast* methods"
2012-01-23 07:24:32 -08:00
Michael Jurka
5274d6f115
Merge "Improve rapid-fire presses on system bar"
2012-01-23 07:23:56 -08:00
Dianne Hackborn
5204f263ce
am 02d37b97: resolved conflicts for merge of 892d11f4 to master
...
* commit '02d37b9731eaf5d79f9eb395576e030934c37f3b':
Fix issue #5823276 again: home repaints after full-screen app is exited
2012-01-20 18:48:25 -08:00
Dianne Hackborn
02d37b9731
resolved conflicts for merge of 892d11f4 to master
...
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
2012-01-20 18:42:07 -08:00
Christopher Tate
962847912d
am 65f87ec7: Merge "Fix shared-storage full backup"
...
* commit '65f87ec733955455b66ea704e85709189b1cea80':
Fix shared-storage full backup
2012-01-20 18:01:10 -08:00
Christopher Tate
65f87ec733
Merge "Fix shared-storage full backup"
2012-01-20 17:59:06 -08:00
Christopher Tate
73d7369e0f
Fix shared-storage full backup
...
The special shared-storage step was mistakenly writing its data directly
to the USB output pipe rather than to the proper stacked data handling
chain that applies compression and encryption. Fix this by getting rid
of the custom handling of the shared-storage data, instead folding it
into the normal data handling flow [with a small amount of additional
management because e.g. it doesn't need a "manifest" pseudofile in the
archive stream].
Fixes bug 5897791
Change-Id: I3995b07963334d2f8cce49b247c87d3d3ff93bed
2012-01-20 17:41:41 -08:00
Glenn Kasten
79f39722b4
am 0f73d75d: Merge "Remove AudioFlinger dependencies on client"
...
* commit '0f73d75da069e8af200092c0c6a8487108fdcbfb':
Remove AudioFlinger dependencies on client
2012-01-20 17:19:13 -08:00
Glenn Kasten
0f73d75da0
Merge "Remove AudioFlinger dependencies on client"
2012-01-20 17:16:36 -08:00
Glenn Kasten
34f9f8bb83
Remove AudioFlinger dependencies on client
...
Change-Id: Ibb591e41a3ca5d7015e2b66b98b8fef5f415fb37
2012-01-20 17:12:59 -08:00
Guang Zhu
1bc2cbfdd4
am 7a640a09: Merge "Revert "Use port 18000 instead of 8000 for layout tests""
...
* commit '7a640a093639c712ed4e37d06cb86c50d88bd376':
Revert "Use port 18000 instead of 8000 for layout tests"
2012-01-20 17:09:09 -08:00
Guang Zhu
7a640a0936
Merge "Revert "Use port 18000 instead of 8000 for layout tests""
2012-01-20 17:06:42 -08:00