drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,179 Commits 1 Branch 0 Tags
Commit Graph

94179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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