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

96035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
bd2a4d6941 am 84ee173d: am f5b07806: am e05d4de5: am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev 
* commit '84ee173d9ac7334130d1c974482710ae39a83d1e':
  docs: Update platform version page with 4.2 release
 2012-11-13 13:44:11 -08:00
Joe Fernandez
84ee173d9a am f5b07806: am e05d4de5: am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev 
* commit 'f5b07806bb831cf8e7c3bbe60fc4f67b4975d0ea':
  docs: Update platform version page with 4.2 release
 2012-11-13 13:42:39 -08:00
Joe Fernandez
f5b07806bb am e05d4de5: am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev 
* commit 'e05d4de55a356c94fabf9ecc5db68d5c710f1e5e':
  docs: Update platform version page with 4.2 release
 2012-11-13 13:40:50 -08:00
Joe Fernandez
e05d4de55a am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev 
* commit '9b703463ebf67182e78dd2b05183636fbb37f3c9':
  docs: Update platform version page with 4.2 release
 2012-11-13 13:38:25 -08:00
Joe Fernandez
9b703463eb Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev 2012-11-13 13:36:01 -08:00
Tim Murray
63f316f1b5 Merge "Java RS latency benchmark." 2012-11-13 13:12:22 -08:00
Joe Fernandez
3bdf4b6ca5 docs: Update platform version page with 4.2 release 
Change-Id: I98f8090a8cf8100584a428c407374d7188d1f42b
 2012-11-13 12:31:57 -08:00
Scott Main
085c47c7d9 am dda54fb6: am f88e08d3: am 17a3f233: am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev 
* commit 'dda54fb6cee9a9083ce3ace8ae580f97488405af':
  docs: add ndk tos wall
 2012-11-13 11:50:40 -08:00
Scott Main
dda54fb6ce am f88e08d3: am 17a3f233: am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev 
* commit 'f88e08d3fd1a6dbe6fbbd7166c5c300a72db2257':
  docs: add ndk tos wall
 2012-11-13 11:48:41 -08:00
Scott Main
f88e08d3fd am 17a3f233: am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev 
* commit '17a3f233deec082274868746a3baa11289774955':
  docs: add ndk tos wall
 2012-11-13 11:46:15 -08:00
Scott Main
17a3f233de am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev 
* commit 'f20b146fffdb672fb5b541d150240f8ef21a8710':
  docs: add ndk tos wall
 2012-11-13 11:42:53 -08:00
Scott Main
f20b146fff Merge "docs: add ndk tos wall" into jb-mr1-dev 2012-11-13 11:41:14 -08:00
Fabrice Di Meglio
7a12433390 am bb67d486: am a97f5b8c: am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 
* commit 'bb67d48606afdeb34fc488fb16f18c136eb49ec8':
  Fix bug #7457897 Error icons are not shown in credit card entry form
 2012-11-13 11:24:49 -08:00
Scott Main
66e642b6d0 docs: add ndk tos wall 
Change-Id: Ic7338d7d3606a017c84ce9895dfe68f2b931d182
 2012-11-13 11:24:35 -08:00
Michael Jurka
7f1c0219fe am 75386446: am 81b74a61: am c1d5db79: Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 
* commit '75386446388ce3e91a7d96d6ebcef79c90e663f1':
  Add xxhdpi version of default activity icon
 2012-11-13 11:19:27 -08:00
Fabrice Di Meglio
bb67d48606 am a97f5b8c: am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 
* commit 'a97f5b8c2585c87e1b82e5ce3b7aab149668a711':
  Fix bug #7457897 Error icons are not shown in credit card entry form
 2012-11-13 11:07:30 -08:00
Fabrice Di Meglio
a97f5b8c25 am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 
* commit '9d82d324de7d544c95458faa05a87014e53e8892':
  Fix bug #7457897 Error icons are not shown in credit card entry form
 2012-11-13 11:05:58 -08:00
Fabrice Di Meglio
9d82d324de Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 2012-11-13 11:03:19 -08:00
Marco Nelissen
c1374e8e1a Fix build 
Restore unused-but-public "resolveAdjustedSize" method.

Change-Id: I2f2bdbf96c484bcd457790fde970f1c67296b857
 2012-11-13 10:54:51 -08:00
Michael Jurka
7538644638 am 81b74a61: am c1d5db79: Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 
* commit '81b74a61d76ac97cdcf89a6548b962d41093b0d6':
  Add xxhdpi version of default activity icon
 2012-11-13 10:47:09 -08:00
Marco Nelissen
cccef471cc Merge "Make VideoView/MediaController behave better" 2012-11-13 10:45:46 -08:00
Michael Jurka
81b74a61d7 am c1d5db79: Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 
* commit 'c1d5db796385e011b253b8f260d6e96a2c922f59':
  Add xxhdpi version of default activity icon
 2012-11-13 10:41:36 -08:00
Michael Jurka
c1d5db7963 Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 2012-11-13 10:36:26 -08:00
Craig Mautner
0f32fdc3db am 50acd731: am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit '50acd73173e5ca68db0a4cc01e75a2faef86b2fb':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:07:29 -08:00
Craig Mautner
50acd73173 am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit '67a3fb6f3b787f0151c7f76f0c19dd1c8b80ae4e':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:04:27 -08:00
Craig Mautner
67a3fb6f3b am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 
* commit 'c10914ca5c83ad6ac2c9acd7b52bfeb05d6e72e5':
  Support Wifi display devices that rename themselves.
 2012-11-13 10:02:21 -08:00
Craig Mautner
c10914ca5c Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 2012-11-13 10:00:04 -08:00
Dirk Dougherty
d305b4427a am 8a96ab8f: am 9d5e78bf: am ed41bc22: am c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev 
* commit '8a96ab8f312a24d7debaa5eae8d904599bb4a7a3':
  Doc change: update image for landing page.
 2012-11-13 09:36:29 -08:00
Dirk Dougherty
8a96ab8f31 am 9d5e78bf: am ed41bc22: am c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev 
* commit '9d5e78bfa6de9c2279e7a483b0dc701c1b6b064e':
  Doc change: update image for landing page.
 2012-11-13 09:33:30 -08:00
Dirk Dougherty
9d5e78bfa6 am ed41bc22: am c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev 
* commit 'ed41bc22814dd86a605569afa422278f716d940a':
  Doc change: update image for landing page.
 2012-11-13 09:29:11 -08:00
Dirk Dougherty
ed41bc2281 am c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev 
* commit 'c178ebe719b80418cb193865ef68bb21cd5b7a1b':
  Doc change: update image for landing page.
 2012-11-13 09:25:46 -08:00
Dirk Dougherty
c178ebe719 Merge "Doc change: update image for landing page." into jb-mr1-dev 2012-11-13 09:23:50 -08:00
Scott Main
9dfa4a71de am b2ff3738: am 03f214b1: am a9e60898: am bd2b5313: Merge "docs: edits" into jb-mr1-dev 
* commit 'b2ff373843d527f6b0e49041163e10568123f857':
  docs: edits
 2012-11-13 09:21:21 -08:00
Dirk Dougherty
b5e15cab4b Doc change: update image for landing page. 
Change-Id: I8e88b3972c5597e0510b94938572b7219eecba46
 2012-11-13 09:21:00 -08:00
Scott Main
b2ff373843 am 03f214b1: am a9e60898: am bd2b5313: Merge "docs: edits" into jb-mr1-dev 
* commit '03f214b1786ffb23a5acb5fdea1ebadabf53cb04':
  docs: edits
 2012-11-13 09:18:27 -08:00
Scott Main
03f214b178 am a9e60898: am bd2b5313: Merge "docs: edits" into jb-mr1-dev 
* commit 'a9e608980e3818703a14814b5f421d0bd644e920':
  docs: edits
 2012-11-13 09:16:10 -08:00
Scott Main
a9e608980e am bd2b5313: Merge "docs: edits" into jb-mr1-dev 
* commit 'bd2b531359d7402b742c4a126ff1c0782107ab79':
  docs: edits
 2012-11-13 09:13:41 -08:00
Scott Main
bd2b531359 Merge "docs: edits" into jb-mr1-dev 2012-11-13 09:10:21 -08:00
Scott Main
ca211c7429 docs: edits 
Change-Id: I6a9f22100a138c594993cd9e0c1edfe0bb33affa
 2012-11-13 09:08:42 -08:00
Baligh Uddin
d49e9c30ab Merge "Import translations. DO NOT MERGE" 2012-11-13 09:00:46 -08:00
Baligh Uddin
06b8a1611f am 4ec56764: (-s ours) am 5b2a59d8: am 9885af05: am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '4ec5676466f0e5a52902919aaf363728bab95f93':
  Import translations. DO NOT MERGE
 2012-11-13 08:59:57 -08:00
Baligh Uddin
4ec5676466 am 5b2a59d8: am 9885af05: am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '5b2a59d8221e7be03867b02f0f36746df3df97cf':
  Import translations. DO NOT MERGE
 2012-11-13 08:58:12 -08:00
Baligh Uddin
5b2a59d822 am 9885af05: am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9885af055816abebfbcf1ed5e06d4c738f7ec501':
  Import translations. DO NOT MERGE
 2012-11-13 08:55:47 -08:00
Baligh Uddin
9885af0558 am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9508e31dcd41bbdbff255913b72489af95e9bd0c':
  Import translations. DO NOT MERGE
 2012-11-13 08:53:29 -08:00
Baligh Uddin
9508e31dcd Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-13 08:50:51 -08:00
Craig Mautner
3916779978 am 07f1a6ce: (-s ours) am 78db8500: am 2c37f7b4: Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev 
* commit '07f1a6cecaa2b840cbf15e3160f6a50f3628957d':
  Synchronize access to Locked methods. DO NOT MERGE
 2012-11-13 08:36:09 -08:00
Craig Mautner
07f1a6ceca am 78db8500: am 2c37f7b4: Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev 
* commit '78db850049b2312a82f408373d22c83c5ad8fa56':
  Synchronize access to Locked methods. DO NOT MERGE
 2012-11-13 08:33:19 -08:00
Craig Mautner
78db850049 am 2c37f7b4: Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev 
* commit '2c37f7b45522d908e1ffc5e63ffccfbe4cdea34b':
  Synchronize access to Locked methods. DO NOT MERGE
 2012-11-13 08:30:19 -08:00
Craig Mautner
2c37f7b455 Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev 2012-11-13 08:27:22 -08:00
Marco Nelissen
0b2d87237e Make VideoView/MediaController behave better 
Make VideoView support wrap_content size, and position the MediaController
inside of the anchor view instead of below it and centered on the screen.
b/6179034

Change-Id: Iec0dd9a1d953f742bbf7b12065946743a03745e5
 2012-11-13 07:55:20 -08:00