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

96010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
cccef471cc Merge "Make VideoView/MediaController behave better" 2012-11-13 10:45:46 -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
Scott Main
69f7cad733 am 4856186d: am 67f46470: am 03fb5698: am 574c2cbf: Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev 
* commit '4856186d96a133042b5bbe32a6cbfec95427c3e5':
  docs: add templated tabs for jb highlights
 2012-11-13 07:54:47 -08:00
Scott Main
4856186d96 am 67f46470: am 03fb5698: am 574c2cbf: Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev 
* commit '67f46470a57287d9555333703c20ad4a4802bb4e':
  docs: add templated tabs for jb highlights
 2012-11-13 07:51:50 -08:00
Scott Main
67f46470a5 am 03fb5698: am 574c2cbf: Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev 
* commit '03fb5698baba5686143385e0d5771d2e26d3665b':
  docs: add templated tabs for jb highlights
 2012-11-13 07:48:43 -08:00
Scott Main
03fb5698ba am 574c2cbf: Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev 
* commit '574c2cbfb628e58c8b9ab28a4d7483c4024cef56':
  docs: add templated tabs for jb highlights
 2012-11-13 07:46:50 -08:00
Scott Main
574c2cbfb6 Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev 2012-11-13 07:42:57 -08:00
Scott Main
5617b06917 docs: add templated tabs for jb highlights 
Change-Id: I2353ec2bf96b5c0da46a2803639ef607fd12e167
 2012-11-13 07:39:35 -08:00
Dirk Dougherty
fb6f766526 am 16b55451: am a6e0fb04: am 98fc49ab: am 64b12118: Doc change: edits and landing page. 
* commit '16b554513e875083b733e448cf38053b15dac016':
  Doc change: edits and landing page.
 2012-11-13 07:30:17 -08:00
Dirk Dougherty
16b554513e am a6e0fb04: am 98fc49ab: am 64b12118: Doc change: edits and landing page. 
* commit 'a6e0fb04751038202649e68a672045adc29a2905':
  Doc change: edits and landing page.
 2012-11-13 07:27:16 -08:00
Dirk Dougherty
a6e0fb0475 am 98fc49ab: am 64b12118: Doc change: edits and landing page. 
* commit '98fc49ab16d038d37c0a8a9e652cbebbb8eb3a1f':
  Doc change: edits and landing page.
 2012-11-13 07:25:11 -08:00
Dirk Dougherty
98fc49ab16 am 64b12118: Doc change: edits and landing page. 
* commit '64b12118ba74762e22ea186eca5ffcbc8b4acd14':
  Doc change: edits and landing page.
 2012-11-13 07:22:06 -08:00
Dirk Dougherty
64b12118ba Doc change: edits and landing page. 
Change-Id: Id79387c68771452dc091bbb2f8a576f33ecef68e
 2012-11-13 07:14:12 -08:00
Dirk Dougherty
172d397f9a am d684ef4b: am 32c4fb47: am 56411cc3: am b4d28dbf: Merge "Doc change: image optimizations for docs." into jb-mr1-dev 
* commit 'd684ef4b8005b5ccc61722cf799431402d6ea149':
  Doc change: image optimizations for docs.
 2012-11-13 07:03:35 -08:00
Dirk Dougherty
d684ef4b80 am 32c4fb47: am 56411cc3: am b4d28dbf: Merge "Doc change: image optimizations for docs." into jb-mr1-dev 
* commit '32c4fb47827f0d6879ade7d93e9e819b992daa29':
  Doc change: image optimizations for docs.
 2012-11-13 07:00:35 -08:00
Dirk Dougherty
32c4fb4782 am 56411cc3: am b4d28dbf: Merge "Doc change: image optimizations for docs." into jb-mr1-dev 
* commit '56411cc37b5756b367ab1ff398c949b2c84ad227':
  Doc change: image optimizations for docs.
 2012-11-13 06:58:41 -08:00
Dirk Dougherty
56411cc37b am b4d28dbf: Merge "Doc change: image optimizations for docs." into jb-mr1-dev 
* commit 'b4d28dbf77d6983ed6b6f52e0a05da9c8be5ee85':
  Doc change: image optimizations for docs.
 2012-11-13 06:55:28 -08:00
Dirk Dougherty
b4d28dbf77 Merge "Doc change: image optimizations for docs." into jb-mr1-dev 2012-11-13 06:53:15 -08:00
Scott Main
77c34aa85d am 3bd475bf: am 406273f6: am 4cddf7fb: am 5878e2b3: Merge "docs: fix bug with unknown anchors" into jb-mr1-dev 
* commit '3bd475bfc676194990b9a3846ad725a952e1ce8d':
  docs: fix bug with unknown anchors
 2012-11-13 06:32:15 -08:00
Scott Main
8b0466d1e6 am 6e9855fe: am 5faf9d0e: am f8dbf375: am 2c7e6cb7: Merge "docs: add tabs to JB highlights" into jb-mr1-dev 
* commit '6e9855fe3d9ef83aafa6d2df36408dfdc254cb8f':
  docs: add tabs to JB highlights
 2012-11-13 06:32:11 -08:00
Dirk Dougherty
04ca383add am a00ea6cf: am 4ab45c14: am 8ae77b67: am 23492df7: Doc change: resize some assets for highlights. 
* commit 'a00ea6cf7326b1ac7d32b7ef4c3b71d45f5b7f37':
  Doc change: resize some assets for highlights.
 2012-11-13 06:32:07 -08:00
Dirk Dougherty
a2ae38709f am 8b062e9b: am 20e63222: am 6293affa: am e320ac7a: Merge "Doc change: edits to highlights files." into jb-mr1-dev 
* commit '8b062e9b447b74959510ab86d9c7996caa0eff1f':
  Doc change: edits to highlights files.
 2012-11-13 06:32:02 -08:00
Scott Main
3bd475bfc6 am 406273f6: am 4cddf7fb: am 5878e2b3: Merge "docs: fix bug with unknown anchors" into jb-mr1-dev 
* commit '406273f6f321278638b841cdbe9d7a5e6341341c':
  docs: fix bug with unknown anchors
 2012-11-13 06:28:46 -08:00
Scott Main
6e9855fe3d am 5faf9d0e: am f8dbf375: am 2c7e6cb7: Merge "docs: add tabs to JB highlights" into jb-mr1-dev 
* commit '5faf9d0e04d82f91a853165ee135af4fc73d4418':
  docs: add tabs to JB highlights
 2012-11-13 06:28:42 -08:00