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

121426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
63567e3829 Merge "Ensure transient state views are consistently temporarily detached" 2013-12-18 02:31:40 +00:00
Scott Main
418312f44c am 991ba3b7: am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '991ba3b7f2d7164fab956b54c711d5ea523b2ba5':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:53:57 +00:00
Scott Main
991ba3b7f2 am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '74e9e698260c16c41dab38de302db6e3e807ddd5':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:50:59 +00:00
Scott Main
74e9e69826 am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '7d1f8e6570b8137dbe1e9007bb8496a0f6c3cb53':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:48:03 +00:00
Scott Main
7d1f8e6570 am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit 'efe102332861bd05f0cba60e729661607546de34':
  fix typos bug: 11693951 bug: 12118617
 2013-12-17 16:44:31 -08:00
Scott Main
efe1023328 am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '5dcb75e67b7a3401aa501126bc8401f78c181a68':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:41:23 +00:00
Scott Main
5dcb75e67b Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 2013-12-18 00:38:30 +00:00
Chris Craik
1732f2639b Merge "Check mDisplayListData before deref" 2013-12-17 23:24:15 +00:00
Scott Main
1b3df0e9c8 am 84b8cbda: am 22591164: am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '84b8cbdafe1ed6b3d16291c6a0b7ec95ffcd076e':
  fix sidenav links to use toroot variable
 2013-12-17 23:15:06 +00:00
Scott Main
84b8cbdafe am 22591164: am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '2259116450f25ae75d8d142a2bf15f3d5db35bd6':
  fix sidenav links to use toroot variable
 2013-12-17 23:12:13 +00:00
Scott Main
2259116450 am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '007ae376d7672a456213e7f5475de4a910594cb2':
  fix sidenav links to use toroot variable
 2013-12-17 23:08:37 +00:00
Chris Craik
8b62cda493 Check mDisplayListData before deref 
bug:12191897
Change-Id: I72ed3801e72c657b9d7736b0efb33c5e7cfd5b57
 2013-12-17 15:07:47 -08:00
Scott Main
007ae376d7 am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '8c95a149b516595e22fa7b6479d7bc02750531c2':
  fix sidenav links to use toroot variable
 2013-12-17 15:06:31 -08:00
Scott Main
8c95a149b5 am 5b50239c: fix sidenav links to use toroot variable 
* commit '5b50239c33176e0b321d2ee32a589e0583767e02':
  fix sidenav links to use toroot variable
 2013-12-17 23:03:49 +00:00
Scott Main
5b50239c33 fix sidenav links to use toroot variable 
Change-Id: I5f63979adbe13ea0d02bb8fedc1a7d29d79f307f
 2013-12-17 14:59:05 -08:00
Victoria Lease
2ee2d59b7d pass SkGlyphCache into updateGlyphCache() 
Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.

Bug: 11968757
Change-Id: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89
 2013-12-17 14:51:43 -08:00
Tim Murray
638fcf0df6 Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs." 2013-12-17 22:14:29 +00:00
Scott Main
21d08fcb50 am 6652ef46: am dd55de3d: am 9767f9e2: am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 1190750 
* commit '6652ef463dd7976f522dac7fca5be06e11188cd4':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 22:10:05 +00:00
Scott Main
6652ef463d am dd55de3d: am 9767f9e2: am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-d 
* commit 'dd55de3ddc7d9e7d2782a409560cb3eda30ba05b':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 22:06:38 +00:00
Scott Main
dd55de3ddc am 9767f9e2: am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 
* commit '9767f9e2120609ada992e558ba16608aafa96811':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 22:03:16 +00:00
Scott Main
9767f9e212 am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 
* commit '7df86ef441835aedf24477f61e12cf78c5a86244':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 14:00:45 -08:00
Scott Main
7df86ef441 am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 
* commit '9e36f588993e02210f02d9b7c0600a842d67bbdb':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 21:57:46 +00:00
Dirk Dougherty
7f8f315c1d am fe4a997b: am bfc22ba2: am 4ffa6a4a: am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit 'fe4a997be76e70952566f301577393e7339c7199':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 21:55:36 +00:00
Scott Main
688342f98c fix typos 
bug: 11693951
bug: 12118617

Change-Id: I7a3ab4c6d7bc124ff9ed8779700e77c87409569d
 2013-12-17 13:55:02 -08:00
Scott Main
9e36f58899 Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 2013-12-17 21:54:48 +00:00
Dirk Dougherty
fe4a997be7 am bfc22ba2: am 4ffa6a4a: am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit 'bfc22ba251ae5eba7ce68d5a8281042519c187a0':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 21:53:09 +00:00
Dirk Dougherty
bfc22ba251 am 4ffa6a4a: am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit '4ffa6a4ae930f724d2e16e85110892db9bb6280e':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 21:50:46 +00:00
Dirk Dougherty
4ffa6a4ae9 am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit 'd994602f99827adc589946453ab58551e31f878e':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 13:45:32 -08:00
Dirk Dougherty
d994602f99 am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit '731ba04536a07582904b4bf64a9eed896cb93bc5':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 21:37:19 +00:00
Dirk Dougherty
731ba04536 Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 2013-12-17 21:34:58 +00:00
Alan Viverette
223622a50d Add reveal drawable, APIs for forwarding Drawable focus and touch 
Hotspot APIs are hidden pending finalization of how we handle IDs.

BUG: 11416827
Change-Id: Iecacb4b8e3690930d2d805ae65a50cf33482a218
 2013-12-17 21:33:38 +00:00
Scott Main
ef3b704d6e am c797221f: am 64d14b5c: am 37826fa9: am 4e73847a: am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of s 
* commit 'c797221f4400c19e9080a1037744094e1bc15801':
  initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
 2013-12-17 21:32:12 +00:00
Scott Main
c797221f44 am 64d14b5c: am 37826fa9: am 4e73847a: am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree 
* commit '64d14b5cd9c548b313da1a9b211c3ea02deb753d':
  initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
 2013-12-17 21:29:00 +00:00
Tim Murray
d1576fb039 Move RenderScript from graphics/ to new fw/base subdirectory rs. 
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
 2013-12-17 13:28:17 -08:00
Scott Main
64d14b5cd9 am 37826fa9: am 4e73847a: am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Re 
* commit '37826fa9a973463d5698cbdaa4c844c981804459':
  initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
 2013-12-17 21:25:57 +00:00
Scott Main
37826fa9a9 am 4e73847a: am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above 
* commit '4e73847ab0d2278c314f67496b896d4de8c7abdb':
  initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
 2013-12-17 13:21:36 -08:00
Scott Main
4e73847ab0 am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perf 
* commit '5cdadb48d0e696352c21794861ba533214b06318':
  initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
 2013-12-17 21:19:42 +00:00
Scott Main
5cdadb48d0 initial shuffle of the API guide nav to add introduction 
* revise to the Compatibility doc, put it in Intro
* put Permissions in Intro
* put App Fundamentals in Intro
* move Manifest docs to the top of side nav tree
* move App Resources above UI
Will perform another fix to the Best Practices section
later to deprecate some docs there and point to Training instead

Change-Id: I88a8f94167ba15e97eb3bbbc08fd82dd82498e4b
 2013-12-17 13:14:17 -08:00
Dirk Dougherty
d6fb69933d Doc change: update list of tablets supported in Google Play for Education. 
Change-Id: Ic042a7b7d422f843c8274d94b46f4a874014d7ff
 2013-12-17 12:46:40 -08:00
Greg Hackmann
6ab81e996d am 69ad42a3: am 1877f7dc: am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock" 
* commit '69ad42a3cf12bf39fe2c47c4298f23567b3306ef':
  Add /dev/rtc backend to SystemClock
 2013-12-17 20:13:00 +00:00
Greg Hackmann
10df052c6a am f1bdbdd1: resolved conflicts for merge of 08579921 to klp-modular-dev 
* commit 'f1bdbdd1bea9662f6731b7a366de1f602f43e5a9':
  Add timerfd backend to AlarmManagerService
 2013-12-17 20:09:09 +00:00
Greg Hackmann
69ad42a3cf am 1877f7dc: am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock" 
* commit '1877f7dc58d28146bd1907352cb46dbc95302cbb':
  Add /dev/rtc backend to SystemClock
 2013-12-17 20:08:26 +00:00
Greg Hackmann
f1bdbdd1be resolved conflicts for merge of 08579921 to klp-modular-dev 
Change-Id: I08e9f9a2d2185ccf0c41a87c8527ea7e02ac3117
 2013-12-17 11:56:22 -08:00
Zhijun He
bd6877f968 Merge "Camera2: Update metadata java docs" 2013-12-17 18:38:54 +00:00
Zhijun He
2807936f5d Camera2: Update metadata java docs 
Java docs for below keys are updated:
- android.edge.mode
- android.noiseReduction.mode

Bug: 12135317
Change-Id: I950d46b90ece2f519e33719427801fc78b36b39c
 2013-12-17 10:35:40 -08:00
Greg Hackmann
2f735d8dc8 am 552eba80: am 153ec6ca: am 3545433d: am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 
* commit '552eba80ef8f48204e77129dd99581d8f0ac3831':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
 2013-12-17 18:24:40 +00:00
Greg Hackmann
552eba80ef am 153ec6ca: am 3545433d: am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 
* commit '153ec6cae7db2053c71541af8973244f0dbf6d4a':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
 2013-12-17 18:22:24 +00:00
Greg Hackmann
1877f7dc58 am 0b64fa7e: am c978799c: Merge "Add /dev/rtc backend to SystemClock" 
* commit '0b64fa7e4b51f1ec96abf49abdc84e2a4c1b4294':
  Add /dev/rtc backend to SystemClock
 2013-12-17 18:19:09 +00:00
Greg Hackmann
0857992140 am 060ae1db: am eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService" 
* commit '060ae1db7bba39cb8171f4267b5de9538f1ab440':
  Add timerfd backend to AlarmManagerService
 2013-12-17 18:19:04 +00:00
Greg Hackmann
153ec6cae7 am 3545433d: am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 
* commit '3545433d052769417dcdd70bc59fbf31f9925ba4':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
 2013-12-17 18:18:58 +00:00