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
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
Joe Fernandez
c06052e672
am baca4e5a: am dfb46cea: am 90172e0f: Merge "docs: App Template Tool documentation" into jb-mr1-dev
...
* commit 'baca4e5a5d70894ab576c8b4efe6289e709ea8df':
docs: App Template Tool documentation
2012-12-17 15:51:48 -08:00
Joe Fernandez
baca4e5a5d
am dfb46cea: am 90172e0f: Merge "docs: App Template Tool documentation" into jb-mr1-dev
...
* commit 'dfb46cea6282ac9321b70af6c9a6f6b5396cde2e':
docs: App Template Tool documentation
2012-12-17 15:49:36 -08:00
Joe Fernandez
dfb46cea62
am 90172e0f: Merge "docs: App Template Tool documentation" into jb-mr1-dev
...
* commit '90172e0f0cb0abfbaa3f1ea0e5251913bd30d828':
docs: App Template Tool documentation
2012-12-17 15:47:56 -08:00
Joe Fernandez
90172e0f0c
Merge "docs: App Template Tool documentation" into jb-mr1-dev
2012-12-17 15:45:30 -08:00
Robert Ly
bfb69176db
am d4f4d14a: am 5042b051: am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
...
* commit 'd4f4d14a91492384c4553b82be27b5f135a41227':
change onEnd() to withEndAction() in javadocs
2012-12-17 15:39:34 -08:00
Robert Ly
d4f4d14a91
am 5042b051: am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
...
* commit '5042b051b395f36d3c582202e9e78758934b79a6':
change onEnd() to withEndAction() in javadocs
2012-12-17 15:37:21 -08:00
Robert Ly
5042b051b3
am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
...
* commit 'e7c3fba7929a1cb73bbe6ca84a5140febc09a62a':
change onEnd() to withEndAction() in javadocs
2012-12-17 15:35:26 -08:00
Robert Ly
e7c3fba792
Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
2012-12-17 15:32:41 -08:00
Robert Ly
8ee2a70f08
change onEnd() to withEndAction() in javadocs
...
Change-Id: Ic9a04bf86d62249b47dc654052d58797dfc3990c
2012-12-17 15:00:08 -08:00
Joe Fernandez
025ec882be
docs: App Template Tool documentation
...
Change-Id: I75b8956b808ab21cb744f67c2ce69405dc0a0de4
2012-12-17 14:41:46 -08:00
Scott Main
771e5a6709
am 01ec5987: am da013c48: am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev
...
* commit '01ec5987d11be67f009a9d2eb3aabee95125090a':
docs: remove developer survery link
2012-12-17 11:49:00 -08:00
Scott Main
01ec5987d1
am da013c48: am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev
...
* commit 'da013c48d74aae3c5723eb569ebb324a94db27f2':
docs: remove developer survery link
2012-12-17 11:47:10 -08:00
Scott Main
da013c48d7
am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev
...
* commit 'f347e841178358b248b5b1abed059079d2ca1ebe':
docs: remove developer survery link
2012-12-17 11:44:49 -08:00
Scott Main
f347e84117
Merge "docs: remove developer survery link" into jb-mr1-dev
2012-12-17 11:42:04 -08:00
Christopher Tate
eea47240b0
am 4b0ed017: Merge "BackupHelpers: Fix Typo"
...
* commit '4b0ed0178de2c9c21bd5514671b8b4282f6a03db':
BackupHelpers: Fix Typo
2012-12-17 11:02:04 -08:00
Scott Main
ec558d520e
docs: remove developer survery link
...
Change-Id: I8f87e53df4f920ace7f8258c6cf0686ad4d8fead
2012-12-17 10:52:40 -08:00
Sascha Prueter
8149820c2b
am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev
...
* commit '25458528f07ef9f4710e669b74b76d687bbc7645':
Handle "CODE_ALREADY_PRESENT" message from Settings app
2012-12-17 10:47:56 -08:00
Sascha Prueter
25458528f0
am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev
...
* commit 'dd2ed93e4794dd8472593cdd21fb7e0056f11dbf':
Handle "CODE_ALREADY_PRESENT" message from Settings app
2012-12-17 10:46:04 -08:00
Sascha Prueter
dd2ed93e47
Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev
2012-12-17 10:42:55 -08:00
Christopher Tate
4b0ed0178d
Merge "BackupHelpers: Fix Typo"
2012-12-17 10:39:41 -08:00
Robert Ly
1d349dd4ee
am 5d2de143: am 4664782f: am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev
...
* commit '5d2de143883381fb65b026b0975730970e6f33c7':
docs: update gms auth docs for bug 7737187
2012-12-17 10:31:45 -08:00
Robert Ly
5d2de14388
am 4664782f: am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev
...
* commit '4664782f88ef1dad1b16a18d51947132d650afeb':
docs: update gms auth docs for bug 7737187
2012-12-17 10:30:00 -08:00
Robert Ly
4664782f88
am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev
...
* commit 'f93a2941ad8ec72f288669da2426605ad85a98ca':
docs: update gms auth docs for bug 7737187
2012-12-17 10:28:01 -08:00
Robert Ly
f93a2941ad
Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev
2012-12-17 10:25:29 -08:00
Craig Mautner
1e9444797d
am 367921dd: (-s ours) Merge "Toast: fix force close if called from system service"
...
* commit '367921dd879cbc041852b121ce35b3c12803d853':
Toast: fix force close if called from system service
2012-12-17 09:40:02 -08:00
Craig Mautner
367921dd87
Merge "Toast: fix force close if called from system service"
2012-12-17 09:05:07 -08:00
Pawit Pornkitprasan
35e4a7029e
Toast: fix force close if called from system service
...
If a toast is created from a system service, an application context
will not be available, use the service context instead.
Fixes
http://code.google.com/p/android/issues/detail?id=40058
http://code.google.com/p/android/issues/detail?id=40075
Change-Id: Ic643f4557fa04476819cd2c3ee640b735eeae429
2012-12-17 18:04:17 +07:00
satok
6bad2f2fef
Handle "CODE_ALREADY_PRESENT" message from Settings app
...
Bug: 7725834
Change-Id: I85c35e73978d606edf9687e2de76c6ffc3c3ee2b
2012-12-17 15:02:04 +09:00
You Kim
8b2e2c8abc
BackupHelpers: Fix Typo
...
delete --> free
Change-Id: Idbf7e677f8cc4a9a9d04e58b5cf7d0f1589c5211
2012-12-17 03:36:10 +09:00
Elliott Hughes
6647f1bd2b
am c749261f: Merge "Fix DateUtils.formatElapsedTime."
...
* commit 'c749261fea1010dfa2d1337bd210c81d13052540':
Fix DateUtils.formatElapsedTime.
2012-12-15 14:58:01 -08:00
Marco Nelissen
50c782190d
am 01f42639: Merge "fix typo in docs"
...
* commit '01f42639f21ec98feb5e5d458632a1a1005b17e8':
fix typo in docs
2012-12-15 14:57:51 -08:00
Elliott Hughes
898d8048b6
am 2eca1b53: Merge "Add return after NULL check in JetPlayer"
...
* commit '2eca1b53ae905f5ddaebaff7156340efdf97cb84':
Add return after NULL check in JetPlayer
2012-12-15 14:57:46 -08:00
Amith Yamasani
507ea24b8f
am ffdc7aed: Merge "avoid crashing system serer process"
...
* commit 'ffdc7aed5ec8f38706ddfad02d3df05493351083':
avoid crashing system serer process
2012-12-15 14:57:40 -08:00
Elliott Hughes
c749261fea
Merge "Fix DateUtils.formatElapsedTime."
2012-12-14 17:39:19 -08:00
Elliott Hughes
2eda18485c
Fix DateUtils.formatElapsedTime.
...
More reuse of StringBuilders, less broken home-grown formatting code.
Long-term, we should hand this over to icu4c, but they're not ready yet.
Bug: http://code.google.com/p/android/issues/detail?id=41401
Bug: 7736688
Change-Id: Ib3c1e1aad05827df646aa18645cce19dffb7551f
2012-12-14 14:29:47 -08:00
The Android Open Source Project
17a890729e
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I5ffbdc1a3993d684898a61c818cfec1a8ff8ce4b
2012-12-14 14:03:22 -08:00
The Android Automerger
b70b69c417
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-14 13:56:13 -08:00
Robert Ly
292bed2055
docs: update gms auth docs for bug 7737187
...
Change-Id: I32c39bbe39ff7d84ea88aeac2ca11a0110700266
2012-12-14 13:31:52 -08:00
Baligh Uddin
3ffa379878
am 8a3eb664: am 435c0374: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '8a3eb6644cc99cd991319dc487446689eb0907e8':
Import translations. DO NOT MERGE
2012-12-14 12:01:57 -08:00
Baligh Uddin
8a3eb6644c
am 435c0374: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '435c03749abd6f504dd5f6dd3c5c3b4d549ff702':
Import translations. DO NOT MERGE
2012-12-14 11:59:50 -08:00
