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

91475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
3b4b067bae Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev 2013-01-29 23:09:41 +00:00
Dirk Dougherty
f04207aad5 Doc change: remove duplicate image directory (use /sdk/images instead). 
Change-Id: If987d7a31d8b9dc203e9d224a59aeeab8aa5297f
 2013-01-29 14:26:02 -08:00
Scott Main
4b7161cbd4 docs: switch devsite doc build to use templates-sdk 
Change-Id: I933cbafa0712de47b4bcf72d2a7c4f99bf18f930
 2013-01-29 14:20:13 -08:00
Doug Zongker
b616f0c239 add android.permission.LOOP_RADIO for access to loop radio device 
Change-Id: I811d70fa67aa758122678809f32b8aade42ced0f
 2013-01-29 10:39:13 -08:00
Scott Main
e75cd4bfd1 docs: add hdf bool for deviste, used to change aspects of the templates 
Change-Id: I6ad24252f10211a88d1f98e356bc9da97442f91c
 2013-01-29 08:29:40 -08:00
Scott Main
48f9f83ba2 Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev 2013-01-29 00:49:59 +00:00
Dirk Dougherty
7b32d32bd3 Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev 2013-01-29 00:40:57 +00:00
Dirk Dougherty
289ad99c17 Add build rule for ds (devsite) online docs. 
Change-Id: I4f1d099995402613f58401a506ba272abfb563ba
 2013-01-28 15:43:49 -08:00
Dirk Dougherty
2c1669c427 Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev 2013-01-28 21:26:01 +00:00
Dirk Dougherty
10550e5bd8 Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed. 
Change-Id: Ib33511f75b72a8019fffb13d396b608cf8e270d2
 2013-01-28 13:17:51 -08:00
Adam Koch
376e707f65 Displaying Bitmaps Efficiently Training - Update sample app 
Update sample app zip (see http://ag/268000)

Change-Id: I678b9286552d559358b0e58cbac0475dbe5e10a1
 2013-01-28 13:58:14 -05:00
Scott Main
7467a0f002 docs: update adb tool page with am and pm reference 
Change-Id: I7b0e5c95a0d98b91c0a8ed39962b52f8ace47c3b
 2013-01-28 10:56:39 -08:00
Dirk Dougherty
df9fa4c602 Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava. 
Change-Id: I0bf0c691db8f190215f95ab8659e28fd73a496d7
 2013-01-25 12:55:16 -08:00
Adam Powell
53d49f1702 am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 
# Via Adam Powell (1) and others
* commit '17f05497be90004c0263c6de173af8c19ece07b0':
  Touch action bar title text: you will go to space today!
 2013-01-23 15:46:20 -08:00
Adam Powell
17f05497be am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit 'c246950043c4c48beb51d5b56d94473e77c5fad2':
  Touch action bar title text: you will go to space today!
 2013-01-23 15:44:47 -08:00
Adam Powell
c246950043 Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 2013-01-23 23:42:36 +00:00
Adam Powell
ce2f911d87 am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 
# Via Adam Powell (1) and others
* commit '650830491868b961e98c1837fb4b4ce7917783b5':
  Prevent simultaneous interaction with action bar and content
 2013-01-23 15:25:50 -08:00
Adam Powell
6508304918 am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba':
  Prevent simultaneous interaction with action bar and content
 2013-01-23 15:24:18 -08:00
Adam Powell
5a32ec3237 Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 2013-01-23 23:20:57 +00:00
Adam Powell
27cba38952 Touch action bar title text: you will go to space today! 
Title/subtitle text in an action bar is now a full alias for home/up.

Add some prototype ActionBar functionality around titles for future
API consideration.

Bug 7966136

Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
 2013-01-23 15:14:31 -08:00
Adam Powell
d28f30a9e0 Prevent simultaneous interaction with action bar and content 
Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
 2013-01-23 14:23:06 -08:00
Amith Yamasani
555b07df08 am 2c64b539: am 596532d9: Properly initialize recognition service if the recognizer component changed. 
* commit '2c64b53976a99f28bc7c0612648581f9b93bf8b0':
  Properly initialize recognition service if the recognizer component changed.
 2013-01-22 15:46:25 -08:00
Amith Yamasani
2c64b53976 am 596532d9: Properly initialize recognition service if the recognizer component changed. 
* commit '596532d9dbea3460dbc989b0316c721ca69f4915':
  Properly initialize recognition service if the recognizer component changed.
 2013-01-22 15:43:53 -08:00
Amith Yamasani
596532d9db Properly initialize recognition service if the recognizer component changed. 
The getServiceInfo() call directly to IPackageManager does not throw an exception.
The return value needed to be checked for null.

Bug: 8031032
Change-Id: I701b9e8cf3b2406a3b35a486183330489b3d46f5
 2013-01-22 15:35:49 -08:00
Robert Ly
4efe071ed6 docs: update auth doc to mention multiple scopes bug 7644251 
Change-Id: I7f0c2e822c306161ae02b11439e5e0095463bcff
 2013-01-18 13:33:25 -08:00
Dake Gu
fe88f1be3d Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev 2013-01-18 21:22:45 +00:00
Victoria Lease
c62eefa02a am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit '3599f0a02129c238177806ce3d6db20853230d4d':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:51:25 -08:00
Victoria Lease
3599f0a021 am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit '0cf97d32178b689184866e731c0a4105d8223d80':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:49:07 -08:00
Victoria Lease
0cf97d3217 Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev 2013-01-18 18:43:11 +00:00
Robert Ly
5287cd7476 am 6d59e0ea: am a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit '6d59e0ead242978eff8a64d314a1f8554694d8a6':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:31:48 -08:00
Robert Ly
6d59e0ead2 am a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit 'a239b933f7982ed069ccd284b4eab0fb5e4b6505':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:28:41 -08:00
Robert Ly
a239b933f7 am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit '548e17dfdbd862cdfc663268a6d67b47f42b9544':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:23:29 -08:00
Robert Ly
548e17dfdb Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 2013-01-18 18:20:40 +00:00
Dake Gu
f8739b992f Fix bug of SimulatedTrackball 
Simulated trackball should not generate KeyEvent if dispatchGenericMotionEvent
returns true

b/8022205

Change-Id: I1857e25407c508c98ef4db85fe146b1e25a0803e
 2013-01-17 18:15:44 -08:00
Roman Nurik
fb80c9e0f8 docs: Add PageTransformer to animations training class 
Change-Id: I01f7e5b1fa078d9219edf190e5e8444192cc55f1
 2013-01-17 15:37:20 -08:00
Andy McFadden
7155becc05 am ba92f666: am ee3a1d5e: am 9b6687bb: Fix code snippet 
* commit 'ba92f6666db5ff5614df348bce5c9081b1495955':
  Fix code snippet
 2013-01-17 12:14:24 -08:00
Andy McFadden
ba92f6666d am ee3a1d5e: am 9b6687bb: Fix code snippet 
* commit 'ee3a1d5ecefe3d67df40c53de892b56ddf71bc81':
  Fix code snippet
 2013-01-17 12:11:47 -08:00
Andy McFadden
ee3a1d5ece am 9b6687bb: Fix code snippet 
* commit '9b6687bbc6a3e2866fdfd8ac3c725138d4c7ecbf':
  Fix code snippet
 2013-01-17 12:09:40 -08:00
Dirk Dougherty
d275891a8a am ce15192c: am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit 'ce15192c72a3491f632d8cee89f2f58da1e4e0b6':
  Doc change: Fix urls to work properly with https.
 2013-01-17 11:55:49 -08:00
Andy McFadden
9b6687bbc6 Fix code snippet 
One of the examples was incorrect (both here and in the original).

http://b.android.com/42776

Change-Id: I2a218b724f50caf47d5185ef529ae8ab3104794f
 2013-01-17 11:24:02 -08:00
Victoria Lease
79d59f0968 DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care. 
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03

Conflicts:

	services/java/com/android/server/ServiceWatcher.java
 2013-01-16 17:37:21 -08:00
Dirk Dougherty
ce15192c72 am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit '4a0f95cffbb9925e95c216aea41f3450885d4061':
  Doc change: Fix urls to work properly with https.
 2013-01-16 16:39:17 -08:00
Dirk Dougherty
4a0f95cffb am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit '3987f6c1793bd44305c491e9b57134a1df285599':
  Doc change: Fix urls to work properly with https.
 2013-01-16 16:37:03 -08:00
Dirk Dougherty
3987f6c179 Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 2013-01-17 00:30:09 +00:00
Justin Koh
ba1992f8e9 Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev 2013-01-17 00:11:44 +00:00
Justin Koh
3944abbb50 Remove doSingleCrunch call DO NOT MERGE 
Remove doSingleCrunch call as it's breaking jb-mr1-aah-dev.

Change-Id: I0d8ee55344792fd868e74e07f31641a85e71168a
 2013-01-16 14:51:29 -08:00
Scott Kennedy
b61121d2a1 am ee6f89ff: am 3332aa98: am d7ec742c: docs: Minor typos 
* commit 'ee6f89ff9cf08f78af84428102b910dd1275ef2d':
  docs: Minor typos
 2013-01-16 10:13:02 -08:00
Scott Main
6f8fe8dd4a am 841c3491: am ceddf9f8: am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit '841c3491143e4946586caa7fe7cd4691d044ce62':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:12:59 -08:00
Scott Main
29502977fc am de902da2: docs: put new devbytes playlist on the develop landing 
* commit 'de902da2c1f9e133de69267b5dbb122bce15adbc':
  docs: put new devbytes playlist on the develop landing
 2013-01-16 10:12:56 -08:00
Scott Kennedy
ee6f89ff9c am 3332aa98: am d7ec742c: docs: Minor typos 
* commit '3332aa985280d7e84c7cb70c33610efdd24873d7':
  docs: Minor typos
 2013-01-16 10:09:46 -08:00