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

124710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
80ddc85515 remove samples page under tools. redirect in separate cl. 
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d

Conflicts:
	docs/html/tools/samples/index.jd
 2014-02-04 08:57:20 -08:00
Scott Main
2b8d9cd216 am c8f40700: am e4cf2729: (-s ours) am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit 'c8f4070018d5b6cf69274b977fff4199b71cbb70':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 07:43:58 -08:00
Scott Main
c8f4070018 am e4cf2729: (-s ours) am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit 'e4cf272967d6cbfc8e9e7c5c2756651e306a2755':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 15:39:46 +00:00
Alan Viverette
342675df4d am 8eea3ea5: Add APIs for obtaining themed Drawable from Theme, Context 
* commit '8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3':
  Add APIs for obtaining themed Drawable from Theme, Context
 2014-02-03 19:04:27 -08:00
Alan Viverette
8eea3ea559 Add APIs for obtaining themed Drawable from Theme, Context 
BUG: 12611005
Change-Id: Ic0057be4e4c2d0c61ce02a019b3f7d0625e3a016
 2014-02-03 18:42:24 -08:00
Scott Main
e4cf272967 am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit '5ae21db11291cca5ea6fe9f8b2b772deca438e5b':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 02:11:48 +00:00
Alan Viverette
a8b2edec93 Clean up RotateDrawable, add getters and setters for XML properties 
Change-Id: I1bb174e981fb6df910fee3a9d596c0249282928c
 2014-02-03 18:08:34 -08:00
Scott Main
5ae21db112 am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit 'a7f84f3bd4582ce2124891db14fbc2ac52548cf8':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 02:08:28 +00:00
Scott Main
a7f84f3bd4 am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit '28a828fa198122a13d053eae2e46f18487818e91':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 02:06:01 +00:00
Ruben Brunk
5cb46b3c8a am 8cff1a37: Merge "camera3: Update awbRegions tag." 
* commit '8cff1a370e8d89c0a977b82cd8730ab791866808':
  camera3: Update awbRegions tag.
 2014-02-03 18:01:40 -08:00
Scott Main
28a828fa19 am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit '56783a742458968a6ec5daf4d9e7a72f755f5ce5':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 02:01:33 +00:00
Ruben Brunk
90bc34e5bf camera3: Update maxRegions tag. 
Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01
 2014-02-03 17:54:24 -08:00
Ruben Brunk
8cff1a370e Merge "camera3: Update awbRegions tag." 2014-02-04 01:18:08 +00:00
Ruben Brunk
f59521d3b1 camera3: Update awbRegions tag. 
Change-Id: I85053b61fae4e360eff9143afc021ad60971f3b6
 2014-02-03 17:14:33 -08:00
Ricardo Cervera
641fc0f751 docs: Added note on multiple build.gradle files. Bug: 12870006 
Change-Id: I44b5152dc753893d3b9f0a0441066a530e5a30f0
Review: http://quixote.mtv.corp.google.com:8006/google/play-services/setup.html
 2014-02-03 17:08:31 -08:00
Scott Main
56783a7424 remove samples page under tools. redirect in separate cl. 
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d
 2014-02-03 17:07:27 -08:00
Glenn Kasten
77c86261ee Add adb over Wi-Fi 
Change-Id: I6ada6c88e3a006abc4685b66d6decd1bec175941
 2014-02-03 16:49:34 -08:00
Andy McFadden
8c8efbf42b am 01127579: Merge "Remove setFlags()" 
* commit '0112757995debe0d4e3527f9f8299380b0561017':
  Remove setFlags()
 2014-02-03 16:42:11 -08:00
Andy McFadden
0112757995 Merge "Remove setFlags()" 2014-02-04 00:39:16 +00:00
Jake Hamby
8f9b33e776 Add new RIL commands to read/write NV items and reset NV config. 
Add new RIL commands and generic code cleanups.

The only changes required for OMA DM support are the
addition of five new methods in ITelephony.aidl for
reading/writing NV items and performing NV config and
radio resets (requires MODIFY_PHONE_STATE), along with
the new RIL request IDs in RILConstants.java.

Bug: 12864208
Change-Id: I958d2571580d98a49936ef2e6822e5ac086acbe2
 2014-02-03 15:52:18 -08:00
Tim Murray
15297ccfd6 am 6faecbb8: am fd71ddfd: (-s ours) am 6ceac9f0: (-s ours) am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP." 
* commit '6faecbb8d2b9f99d88913a0a7af592e193e8a8ae':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-02-03 15:33:46 -08:00
Tim Murray
4e9ed22860 am 43098617: am 5d331c7c: am b1bec0d9: am 3fb6feac: Merge "Check that bound allocations are 1D" 
* commit '430986178dfcc46d84bafd8ad39a16eba30844fd':
  Check that bound allocations are 1D
 2014-02-03 15:33:43 -08:00
Tim Murray
ce2d6963fb am f593000e: am 64788f1b: am 67d9e0be: am 0cc37f4c: Merge "Fix debug context." 
* commit 'f593000eac5ace1538dca3353cffea25d01f26bb':
  Fix debug context.
 2014-02-03 15:33:38 -08:00
Tim Murray
dedbd89791 am 63aec6ac: am 4cd7f2d8: am 42e4aee5: am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs." 
* commit '63aec6acbf7b645cf193c5c53e29db174dfb8628':
  Enable asynchronous destruction of BaseObjs.
 2014-02-03 15:33:35 -08:00
Tim Murray
aef0920832 am 2ee23f3d: am 95b3568d: am 42955bab: am d8b4dd95: Merge "Fix most logging macros for context pointers." 
* commit '2ee23f3dbf5c32d3e3c45bd3740237443acd7152':
  Fix most logging macros for context pointers.
 2014-02-03 15:33:32 -08:00
Tim Murray
9925368b96 am 02eefa0f: am d642dbd8: am d39e19eb: am 351879df: Merge "Fix getBytesSize for YUV allocations." 
* commit '02eefa0f4a6e19d10eecd6ec5d368d5e7b162161':
  Fix getBytesSize for YUV allocations.
 2014-02-03 15:33:23 -08:00
Tim Murray
f71a5fb1cf am 6be5817d: am 2905039d: am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs." 
* commit '6be5817d4201750c60547cfd61b26e4ef07a7c4f':
  Move RenderScript from graphics/ to new fw/base subdirectory rs.
 2014-02-03 15:33:20 -08:00
Tim Murray
4887caa6aa am da1192ae: am 47f295e8: (-s ours) am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2." 
* commit 'da1192ae311c3e02202ed1960e4076352ecb45c9':
  Convert Java/JNI to 64-bit, part 2.
 2014-02-03 15:33:17 -08:00
Tim Murray
d0f3844830 am 7d02a5fc: am 041c77ac: (-s ours) am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac 
* commit '7d02a5fcb73e56a6751642d914cc0bfca5143aae':
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
 2014-02-03 15:33:14 -08:00
Tim Murray
9d4ba0b3f9 am 4e634bd3: am 923da98f: (-s ours) am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array" 
* commit '4e634bd31321471eb1f2065d3936cca668ab292c':
  Use Object + type in place of specific array
 2014-02-03 15:33:12 -08:00
Alan Viverette
9d100eb5c8 am e5aea3bb: Merge "Fix ordering of dimension caching during ImageView.setResource()" 
* commit 'e5aea3bb0c88619bea61569fc9f824741542138d':
  Fix ordering of dimension caching during ImageView.setResource()
 2014-02-03 15:33:09 -08:00
Tim Murray
b31deeb84d am e0abb661: am 4e5e654e: (-s ours) am 69914882: am e559d7ee: Merge "Utility API for creating types." 
* commit 'e0abb6616736b69437b0a9b39eeb1f883c6c0db9':
  Utility API for creating types.
 2014-02-03 15:33:06 -08:00
Tim Murray
449cf425e0 am e32f9988: am b0a79d35: am 271c3b74: am b1c1518e: Merge "Remove old hidden API." 
* commit 'e32f9988be49266436f4eb3975a4d214bd83ea7a':
  Remove old hidden API.
 2014-02-03 15:33:03 -08:00
Tim Murray
c5a671b193 am 693265ae: am a392cdf3: am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture." 
* commit '693265ae557594c04ad51bbc20de7674835c108c':
  Remove hidden API setSurfaceTexture.
 2014-02-03 15:33:00 -08:00
Igor Murashkin
149d37adf0 am eff19d36: Merge "camera2: Revise android.sensor.maxFrameDuration definition" 
* commit 'eff19d36fcbdcf3d554b961905a54e4a01c61629':
  camera2: Revise android.sensor.maxFrameDuration definition
 2014-02-03 15:32:57 -08:00
ztenghui
b277ac2c1d am a989cb29: Merge "Fixing a bad bug when there is no real umbra" 
* commit 'a989cb29c35149b35bf8c332ba39d7167bd95d6b':
  Fixing a bad bug when there is no real umbra
 2014-02-03 15:32:53 -08:00
John Spurlock
284c23a448 am 3aad4f28: Merge "Remove unused line from PhoneWindowManager." 
* commit '3aad4f28376698c0dce78a7d08af4a616c3d5c04':
  Remove unused line from PhoneWindowManager.
 2014-02-03 15:32:50 -08:00
Dianne Hackborn
f4cb4a00b0 am e8d916c0: Merge "More battery history improvements." 
* commit 'e8d916c04c3fb40667fbacb9b6fd1c775ce00b42':
  More battery history improvements.
 2014-02-03 15:32:47 -08:00
Zhijun He
5f7c7b7f14 am 6c90d439: Merge "Camera2: Update sceneFlicker tag spec" 
* commit '6c90d439758add5981dee67674d0aafc5208f427':
  Camera2: Update sceneFlicker tag spec
 2014-02-03 15:32:43 -08:00
Zhijun He
b2f90b1dd2 am 37bac0ae: Merge "Camera2: update lens state tag specs" 
* commit '37bac0aecbf656f0d8b1f0145fbbb30743c59e9b':
  Camera2: update lens state tag specs
 2014-02-03 15:32:40 -08:00
Christopher Tate
190a0bd87f am 31b4834b: Merge "Introduce "IdleService" API to expose idle-time maintenance to apps" 
* commit '31b4834b6d5eb1e5156950930b69221819a84766':
  Introduce "IdleService" API to expose idle-time maintenance to apps
 2014-02-03 15:32:36 -08:00
Zhijun He
1a931fe5d3 am ef83738d: Merge "Camera2: Update pixelArraySize and analog sensitivity tags" 
* commit 'ef83738da65a79defc6dc4f12433b327d670127e':
  Camera2: Update pixelArraySize and analog sensitivity tags
 2014-02-03 15:32:33 -08:00
Geoff Mendal
427f65c778 am 4c2315d1: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '4c2315d10c462cbebe098cae656675a46e8cfe3d':
  Import translations. DO NOT MERGE
 2014-02-03 15:32:31 -08:00
John Spurlock
bc9a5e82bc am 53a470af: am be878d87: am b6a4926c: am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.java 
* commit '53a470af6574dea27a2701e763e6c6b10be75af7':
  Fix typo in ImageView.java
 2014-02-03 15:32:26 -08:00
Alan Viverette
37d46793c0 am edc4664d: Fix broken build in BridgeResources 
* commit 'edc4664d60af1f124d05f0a2b6ba58b837630f51':
  Fix broken build in BridgeResources
 2014-02-03 15:32:18 -08:00
Kenny Root
606dbee41e am faa1057d: am aa6ff54e: am 85ee57d1: am c064a1b5: Merge "Remove DRLCertFactory" 
* commit 'faa1057d4c6cc3941e42d93399fa9cf511c09370':
  Remove DRLCertFactory
 2014-02-03 15:32:15 -08:00
Alan Viverette
98492c9395 am c8577b38: Merge "Revert "Cache display lists for Drawables"" 
* commit 'c8577b384a0e0e04eed6d05660e013b5db47b7f2':
  Revert "Cache display lists for Drawables"
 2014-02-03 15:32:10 -08:00
Alan Viverette
3c446eefd3 am fe0ea8c2: Merge "Allow specification of View theme override as a theme attribute" 
* commit 'fe0ea8c21fe6f6cbaa0594295ec371efca4af824':
  Allow specification of View theme override as a theme attribute
 2014-02-03 15:32:07 -08:00
Alan Viverette
6b7611e3ac am 14a11eee: Merge "Simplify GradientDrawable\'s use of ColorStateList" 
* commit '14a11eeeff3efd5458754785a7c48bbcf68122ef':
  Simplify GradientDrawable's use of ColorStateList
 2014-02-03 15:32:04 -08:00
John Spurlock
47845b1b4d am 17b79985: am 47e276db: am cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev 
* commit '17b79985f4e5e6b696320e29f665adb796a2aef5':
  Update READ&WRITE_DREAM_STATE to signature|system.
 2014-02-03 15:32:01 -08:00