Nick Pelly
640517565c
am 970d0034: (-s ours) am 23e89348: (-s ours) am f63c7565: (-s ours) am 90f51589: am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev
...
* commit '970d00347dfc8e66ba11bb5909905d5c63f24121':
2012-12-17 23:46:37 -08:00
The Android Open Source Project
5568a7cef8
am ecccbbc4: am 9ead33be: am d8d0e2f2: Sync with jb-mr1-dev
...
* commit 'ecccbbc4ac84379b4b4f40fc9c958af886d5e4e5':
2012-12-17 23:46:32 -08:00
Mikhail Naganov
d8e83315fc
am d7d3a575: am f415f3d7: Merge "Deprecate WebSettings.LOAD_NORMAL cache mode."
...
* commit 'd7d3a575b781f413aa46e744a3a41d27113cb223':
2012-12-17 23:46:26 -08:00
James Dong
2f2dbef9c6
am 628e8c4d: am 150275ec: am d9e72eae: am 5eaa5d18: Merge "Fix a typo (dependant => dependent)" into jb-mr1-dev
...
* commit '628e8c4db135dbb601a26f5c688e4367676ca6b4':
2012-12-17 23:46:21 -08:00
Peter Ng
014fd408a4
am 496cc614: am 367f55f2: am 3d964c4e: am 752281db: am 3074dad2: am 8874ab04: help, notificaion page updates and typos -changed copy to remove instances of eg
...
* commit '496cc614e58ce73656150373bd607f7a9483e042':
2012-12-17 23:46:17 -08:00
Ying Wang
372bcde7ba
am aedd525a: (-s ours) am e24a090e: (-s ours) am 4522858d: (-s ours) am 63954229: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'aedd525a432bb7ecb0aeaed43c79b6d437117c42':
2012-12-17 23:46:13 -08:00
The Android Open Source Project
97f84a7cf8
am 798a68a2: am 27a2c849: am a21a6075: Reconcile with jb-mr1-release
...
* commit '798a68a2715621e18e14c3ee8c4bd648aa422fad':
2012-12-17 23:46:08 -08:00
The Android Open Source Project
2b08485b09
am a90af045: am 905272a4: am 8f21770c: am dc7d4627: am 2606fc48: Reconcile with jb-mr0-release jb-release
...
* commit 'a90af045a4523c2a61a6795d15d8cfdf4c0f3821':
2012-12-17 23:46:03 -08:00
Peter Ng
8e09392f63
am 0454f291: am dcdd2575: am 09f18477: am a1f89c7b: am a3b69d1f: am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev
...
* commit '0454f29139d48ff974cdb20905e3d07fa2a5f365':
2012-12-17 23:45:57 -08:00
Fabrice Di Meglio
729f8e56ca
am d724796a: am b3df96ea: am 85c1765e: am 3330ae59: Merge "Improve Toast RTL support" into jb-mr1-dev
...
* commit 'd724796ade4664e3347e0087b4e750ad424a2038':
2012-12-17 23:45:52 -08:00
Adam Powell
bf87ec2f08
am 77a12739: am 7dd2157e: am 2ebfee16: am 859a62ce: Merge "Enforce a maximum size for action button icons." into jb-mr1-dev
...
* commit '77a1273964b1a9810e89ba4b7bc26805eb2a97c3':
2012-12-17 23:45:42 -08:00
Ying Wang
47ed949131
am f4c123ac: (-s ours) am fdfb676d: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'f4c123acaab757af6c18864ea00c5c027c2b47ee':
2012-12-17 23:45:38 -08:00
Ying Wang
530e58f91d
am 434956ab: (-s ours) am 7570ca32: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '434956ab4ecd583c6fe0c1caa54773d254736024':
2012-12-17 23:45:32 -08:00
James Dong
99905c1fd4
am ff66370b: am 34f48b78: am 2542d0de: am 7267baba: Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev
...
* commit 'ff66370b7d7b4a06998c5ed5b77d120a12f0ef9f':
2012-12-17 23:45:24 -08:00
Winson Chung
b25053b1d9
am 52ef24bb: am 21dd5622: Merge "Fixing issue where screenshot error message is clipped and share action is missing subject. (Bug 6800151, Bug 6721459)"
...
* commit '52ef24bbb4259222f584a2d49720dcbcf59d463f':
2012-12-17 23:45:17 -08:00
Adam Powell
41fbe0d4ef
am 83b4ef5c: am 35466be1: am c2ced7be: am e72a6e97: am fc92eb94: am 2ffb1acb: Merge " Fix preload classname for phone policy."
...
* commit '83b4ef5c6f4764c4bdfdb36a4c0eb80f5898c9b2':
2012-12-17 23:45:12 -08:00
Fabrice Di Meglio
b95e8f56ec
am 7f32ddff: am cb57869c: am e2a7c66d: am 619e4dca: Merge "Improve ListPopupWindow RTL support" into jb-mr1-dev
...
* commit '7f32ddff9199e93953edde190af8e86d96268ef6':
2012-12-17 23:45:06 -08:00
Elliott Hughes
26e192aba8
am 1533b514: am 77670822: Merge "Fix Time.parse and Time.parse3339 crashing bugs."
...
* commit '1533b514429fc4a3c772fd75a0c16466b698f3d2':
2012-12-17 23:45:01 -08:00
Mikhail Naganov
167575c639
am cbf9c4e1: am ce76ca51: Add \'getValue\' methods to WebSettings.TextSize and ZoomDensity enums.
...
* commit 'cbf9c4e196f2ba7b5c2660d04410372963c35d35':
2012-12-17 23:44:50 -08:00
Joe Fernandez
257742ef87
am 0c1badc6: am c799aee9: am 858eb008: am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
...
* commit '0c1badc64e5340b643640d37120bf926142dda1b':
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
2012-12-17 23:44:39 -08:00
Jamie Gennis
ed38893568
am f8f147d1: (-s ours) am 81e3c9ed: am d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev
...
* commit 'f8f147d167ed2a6cf5ba4b1b3a633401ecc5d384':
Fade recents thumbnail to transparent earlier.
2012-12-17 23:44:35 -08:00
Nick Pelly
970d00347d
am 23e89348: (-s ours) am f63c7565: (-s ours) am 90f51589: am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev
...
* commit '23e89348ff00b9bfffd08f58e4cbeced50085869':
2012-12-17 23:03:01 -08:00
The Android Open Source Project
ecccbbc4ac
am 9ead33be: am d8d0e2f2: Sync with jb-mr1-dev
...
* commit '9ead33be76efce14cc253a14a04b0aeead0f0db3':
2012-12-17 23:02:43 -08:00
Mikhail Naganov
d7d3a575b7
am f415f3d7: Merge "Deprecate WebSettings.LOAD_NORMAL cache mode."
...
* commit 'f415f3d72bbea4c08f6d52b74bb207b587cde722':
Deprecate WebSettings.LOAD_NORMAL cache mode.
2012-12-17 23:02:27 -08:00
James Dong
628e8c4db1
am 150275ec: am d9e72eae: am 5eaa5d18: Merge "Fix a typo (dependant => dependent)" into jb-mr1-dev
...
* commit '150275ec72b67591c368446e2113e3c950e12ace':
2012-12-17 23:02:11 -08:00
Peter Ng
496cc614e5
am 367f55f2: am 3d964c4e: am 752281db: am 3074dad2: am 8874ab04: help, notificaion page updates and typos -changed copy to remove instances of eg
...
* commit '367f55f2da565d7ce6b92d83d919204064ddc149':
2012-12-17 23:01:57 -08:00
Ying Wang
aedd525a43
am e24a090e: (-s ours) am 4522858d: (-s ours) am 63954229: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e24a090ec6945a94525765aaef6706898df586f5':
2012-12-17 23:01:41 -08:00
The Android Open Source Project
798a68a271
am 27a2c849: am a21a6075: Reconcile with jb-mr1-release
...
* commit '27a2c8495816553cbbf120af8096b9e9f01ed11c':
2012-12-17 23:01:25 -08:00
The Android Open Source Project
a90af045a4
am 905272a4: am 8f21770c: am dc7d4627: am 2606fc48: Reconcile with jb-mr0-release jb-release
...
* commit '905272a439b396161a1e2368fa49e1747cb24143':
2012-12-17 23:01:10 -08:00
Peter Ng
0454f29139
am dcdd2575: am 09f18477: am a1f89c7b: am a3b69d1f: am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev
...
* commit 'dcdd25755128cbb5641448d9912b58b535890935':
2012-12-17 23:00:54 -08:00
Fabrice Di Meglio
d724796ade
am b3df96ea: am 85c1765e: am 3330ae59: Merge "Improve Toast RTL support" into jb-mr1-dev
...
* commit 'b3df96ea219749269c53acb9d8254e2e1d6c7097':
2012-12-17 23:00:38 -08:00
Adam Powell
77a1273964
am 7dd2157e: am 2ebfee16: am 859a62ce: Merge "Enforce a maximum size for action button icons." into jb-mr1-dev
...
* commit '7dd2157ec2864815f4fb7a9e194843b2fb0d2f2d':
2012-12-17 23:00:19 -08:00
Ying Wang
f4c123acaa
am fdfb676d: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'fdfb676df6e5ed4f923bca5d38bf6c41bf237944':
Import translations. DO NOT MERGE
2012-12-17 22:59:57 -08:00
Ying Wang
434956ab4e
am 7570ca32: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '7570ca3269eb751dd902f35dd38154f818b965c9':
Import translations. DO NOT MERGE
2012-12-17 22:59:41 -08:00
James Dong
ff66370b7d
am 34f48b78: am 2542d0de: am 7267baba: Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev
...
* commit '34f48b78a30b811b764fe28d2fd36a120edcd91c':
2012-12-17 22:59:26 -08:00
Winson Chung
52ef24bbb4
am 21dd5622: Merge "Fixing issue where screenshot error message is clipped and share action is missing subject. (Bug 6800151, Bug 6721459)"
...
* commit '21dd5622a476c7b351e543c669184103b858b697':
Fixing issue where screenshot error message is clipped and share action is missing subject. (Bug 6800151, Bug 6721459)
2012-12-17 22:59:04 -08:00
Adam Powell
83b4ef5c6f
am 35466be1: am c2ced7be: am e72a6e97: am fc92eb94: am 2ffb1acb: Merge " Fix preload classname for phone policy."
...
* commit '35466be15c20f72b15b5bc548fe0ff29a4d21cc4':
2012-12-17 22:58:44 -08:00
Fabrice Di Meglio
7f32ddff91
am cb57869c: am e2a7c66d: am 619e4dca: Merge "Improve ListPopupWindow RTL support" into jb-mr1-dev
...
* commit 'cb57869cc3de7132eab0640b732d5456bda91692':
2012-12-17 22:58:23 -08:00
Elliott Hughes
1533b51442
am 77670822: Merge "Fix Time.parse and Time.parse3339 crashing bugs."
...
* commit '776708222a4bfafa13861950cefcffedc0becab7':
Fix Time.parse and Time.parse3339 crashing bugs.
2012-12-17 22:58:07 -08:00
Mikhail Naganov
cbf9c4e196
am ce76ca51: Add \'getValue\' methods to WebSettings.TextSize and ZoomDensity enums.
...
* commit 'ce76ca51d832387fe5922115f228af0ac64ea4d8':
Add 'getValue' methods to WebSettings.TextSize and ZoomDensity enums.
2012-12-17 22:57:44 -08:00
Joe Fernandez
0c1badc64e
am c799aee9: am 858eb008: am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
...
* commit 'c799aee9b85062a389e444c0b3009b6f0ad512a2':
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
2012-12-17 19:01:41 -08:00
Jamie Gennis
f8f147d167
am 81e3c9ed: am d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev
...
* commit '81e3c9ed66ce6968a331c4eafb969f66234d6e8a':
Fade recents thumbnail to transparent earlier.
2012-12-17 19:00:00 -08:00
Joe Fernandez
c799aee9b8
am 858eb008: am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
...
* commit '858eb008eb3ea720d9c38346706f4d94bd43f917':
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
2012-12-17 18:59:04 -08:00
Jamie Gennis
81e3c9ed66
am d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev
...
* commit 'd2a21d7fee7ba3c9596baf16cadc76dd607a5cb1':
Fade recents thumbnail to transparent earlier.
2012-12-17 18:57:22 -08:00
Joe Fernandez
858eb008eb
am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
...
* commit '34bdf0abfeaa81b6fe2e8cc95e0ba94893b3e8e8':
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
2012-12-17 18:53:48 -08:00
Jamie Gennis
d2a21d7fee
Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev
2012-12-17 18:30:46 -08:00
Fabrice Di Meglio
b405672819
Merge "Make SystemUI RTL aware"
2012-12-17 17:44:38 -08:00
Craig Mautner
3be73abc69
Fade recents thumbnail to transparent earlier.
...
Reduce the gpu load by fading the recents thumbnail to an alpha of
0.0 before the remaining animations are completed. When alpha hits
0 the gpu treats the layer as hidden and can merge the remaining
layers in time.
This is a partial fix for 7729214.
Change-Id: I9761bbd0554db6454c7eec0485be798b11672ff5
2012-12-17 17:35:58 -08:00
Joe Fernandez
34bdf0abfe
docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict
...
Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696
Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
Change-Id: I315da053238943a7f77cc30564904bbf0cefed62
2012-12-17 17:27:07 -08:00
Jeff Sharkey
df3b8e7e0d
Merge "Move stream creation outside of DrmOutputStream."
2012-12-17 17:07:08 -08:00