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

121233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
0dadf4d030 Merge "Replace auto-create in findViewById() with explicit create() API" 2013-12-17 01:20:22 +00:00
Zhijun He
f353742124 camera2: update java docs for metadata tag spec update 
Below tag spec java docs are updated:
- android.control.mode
- android.control.aeMode
- android.control.afMode
- android.control.awbMode

Bug: 12135317
Change-Id: I83f24c1816dfba1cc042e120fba43c5beb1bd2ae
 2013-12-16 16:56:35 -08:00
Craig Mautner
0b5bf0019f Merge "Fix incorrect setting of TaskRecord.frontOfTask" 2013-12-17 00:50:20 +00:00
Shishir Agrawal
c4d41755d7 Merge "Adding support for SIM communication from Android over logical channels." 2013-12-17 00:44:40 +00:00
Chris Craik
6d384403d7 Merge "Create private properties on GLCanvas for experimentation with 3d" 2013-12-17 00:11:28 +00:00
Craig Mautner
1aa9d0d3f6 Fix incorrect setting of TaskRecord.frontOfTask 
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.

Fixes bug 12171535.

Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
 2013-12-16 16:06:30 -08:00
Alan Viverette
ee17f0b557 Merge "Refactor display adjustments into their own utils class" 2013-12-16 23:49:35 +00:00
Alan Viverette
add12e56d0 Merge "Don't cast FastScroller adapter to BaseAdapter" 2013-12-16 23:36:49 +00:00
Trevor Johns
1dd7fb187d am b8928b05: am 987ac90d: am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit 'b8928b05932f9592cfeeb9c3cdc96c4066de2d55':
  Docs: Clean up HCE dev guide
 2013-12-16 23:27:57 +00:00
Scott Main
e0e8eb3b92 am 6b4cc772: am 201c7874: am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '6b4cc77248a9e093d5111636680a0c7f39428677':
  fix typo bug: 12174614
 2013-12-16 23:27:51 +00:00
Elliott Hughes
36d10e7994 am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 
* commit '3bfc6e76e627d4122a774488f36fb843bb3694fb':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
 2013-12-16 23:27:39 +00:00
Christopher Tate
f1d58daa2f am 409b7c98: (-s ours) am 4275cae4: am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 
* commit '409b7c98b47cb7ece2760aa53730233f54946e46':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
 2013-12-16 23:27:30 +00:00
Trevor Johns
b8928b0593 am 987ac90d: am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit '987ac90d60b8a0b5ae909ce80b5234c1e5c41068':
  Docs: Clean up HCE dev guide
 2013-12-16 23:05:48 +00:00
Trevor Johns
987ac90d60 am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit 'ed8d921a2e8feae859bb1899356a936eb84fe50f':
  Docs: Clean up HCE dev guide
 2013-12-16 23:02:44 +00:00
Trevor Johns
ed8d921a2e am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit 'eec66178668d22910d3889e62087b3797ebf6dd2':
  Docs: Clean up HCE dev guide
 2013-12-16 14:59:19 -08:00
Chris Craik
ba9b613437 Create private properties on GLCanvas for experimentation with 3d 
Change-Id: I17772f61efce727cb4c1111f4d97f58c741786b8
 2013-12-16 14:57:00 -08:00
Trevor Johns
eec6617866 am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit '73c1681b2f557dfba09a2e1a071dec190dd05e36':
  Docs: Clean up HCE dev guide
 2013-12-16 22:56:38 +00:00
Trevor Johns
73c1681b2f Merge "Docs: Clean up HCE dev guide" into klp-docs 2013-12-16 22:43:48 +00:00
Trevor Johns
7643785aa8 Docs: Clean up HCE dev guide 
Fixed various typos and minor errors in the HCE dev guide. Also added a
note to clarify when CATEGORY_PAYMENT should be used vs CATEGORY_OTHER.

Issue: 11991294

Change-Id: Ifa3f30fe5f35715a4cea3f3565b6f3771f44814a
Signed-off-by: Trevor Johns <trevorjohns@google.com>
 2013-12-16 14:37:26 -08:00
Robert Shih
8a7af570ac Merge "MediaController does not check for cancelled motions in onTouchEvent, causing nested invocations of WindowManagerGlobal.addView. Sample stack trace below." 2013-12-16 22:35:28 +00:00
Alan Viverette
f242659afc Refactor display adjustments into their own utils class 
Change-Id: Iddc413d7841d44b00e06ed1c5a02d54eb60858df
 2013-12-16 13:45:39 -08:00
Igor Murashkin
d83adf00ae Merge "camera2: Add support for embedding images into javadoc" 2013-12-16 21:41:02 +00:00
Scott Main
6b4cc77248 am 201c7874: am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '201c78745d093e0a13420a96647965ee1ccaf68f':
  fix typo bug: 12174614
 2013-12-16 21:38:11 +00:00
Scott Main
201c78745d am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '9a1d3d50cf42db2778dd0e7833608d3293353395':
  fix typo bug: 12174614
 2013-12-16 21:34:58 +00:00
Scott Main
9a1d3d50cf am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '316473915d6f41523c21d7077093c4071ebb4283':
  fix typo bug: 12174614
 2013-12-16 13:31:45 -08:00
Scott Main
316473915d am c53b7aad: fix typo bug: 12174614 
* commit 'c53b7aad505b9d3130ad56fe72989704015858a3':
  fix typo bug: 12174614
 2013-12-16 21:29:18 +00:00
Scott Main
c53b7aad50 fix typo 
bug: 12174614

Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f
 2013-12-16 13:22:08 -08:00
Elliott Hughes
3bfc6e76e6 am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 
* commit 'c0d6028f58b0a55e4956b1bc34ac7e4a98b0f894':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
 2013-12-16 21:07:24 +00:00
Elliott Hughes
c0d6028f58 am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 
* commit 'a012fee3c31803799176f3efb75cf2f929eeb062':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
 2013-12-16 21:04:50 +00:00
Elliott Hughes
a012fee3c3 am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 
* commit '5d6332e3744e37ced079e5360f1fa3e0e5681d57':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
 2013-12-16 13:01:19 -08:00
Christopher Tate
409b7c98b4 am 4275cae4: am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 
* commit '4275cae4084cff0e267d9e0d63b968aa0788909a':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
 2013-12-16 20:58:11 +00:00
Elliott Hughes
5d6332e374 Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 2013-12-16 20:58:02 +00:00
Christopher Tate
4275cae408 am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 
* commit 'e998b6076532daaa9c2c621a09a04d67a75a5ad0':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
 2013-12-16 20:52:13 +00:00
Christopher Tate
e998b60765 am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 
* commit '6040bd47f41fd56ee608f6a80a0babe942ea1df3':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
 2013-12-16 12:49:55 -08:00
Christopher Tate
6040bd47f4 Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 2013-12-16 20:44:33 +00:00
Igor Murashkin
7a9b30e9e3 camera2: Add support for embedding images into javadoc 
- Also finishes specifying CaptureResult#LENS_SHADING_MAP family

Bug: 12135317
Change-Id: I95ffd61872fefcf2c79cb4f5aa0740162ccc16ad
 2013-12-16 11:43:49 -08:00
John Reck
0a11eb10ff Merge "Add drawGlFunctor support to RenderThread" 2013-12-16 18:55:22 +00:00
Andres Morales
2ab25f1525 Merge "Adding accessor for integer tech codes to Tag" 2013-12-16 18:50:23 +00:00
Nick Kralevich
9d7d4da6b7 am fc800d40: am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 
* commit 'fc800d407d695926ba07299c4e27d1e06284098f':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
 2013-12-16 18:47:03 +00:00
Andres Morales
3e4b665bc6 Adding accessor for integer tech codes to Tag 
Change-Id: I02c272acc9744756677afa8a9d1dca7f1e63ca50
 2013-12-16 10:46:36 -08:00
Nick Kralevich
fc800d407d am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 
* commit 'fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
 2013-12-16 18:44:04 +00:00
Nick Kralevich
fbd6d5a8f8 am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 
* commit '09fdc159552c85032ce9860fc0d63b6eebeca82a':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
 2013-12-16 18:41:03 +00:00
Katie McCormick
d9a32847e5 am 0f3390f8: am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit '0f3390f846ed5ee63e3926b78878c7b75ee2f0c0':
  Doc update: clarify version of flags.
 2013-12-16 18:39:25 +00:00
Katie McCormick
0f3390f846 am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit 'c49273895ea96da5d88c806fb6acd4a92b963f84':
  Doc update: clarify version of flags.
 2013-12-16 18:36:41 +00:00
Nick Kralevich
09fdc15955 am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 
* commit '3ddee4dec9b7ae2265c356f5809eae73e1ef8796':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
 2013-12-16 10:36:39 -08:00
Katie McCormick
c49273895e am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit '1e609ac45df13fed93df81e805ea6d6485da3aa0':
  Doc update: clarify version of flags.
 2013-12-16 18:33:42 +00:00
Katie McCormick
1e609ac45d am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit '4e6c5408273882fc297142456c0ad5bbcb5f2f6a':
  Doc update: clarify version of flags.
 2013-12-16 10:29:57 -08:00
Nick Kralevich
3ddee4dec9 Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 2013-12-16 18:28:42 +00:00
Katie McCormick
4e6c540827 am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit 'c8b93fd9727d5ac408f492b22364c1d50c5bc97a':
  Doc update: clarify version of flags.
 2013-12-16 18:28:00 +00:00
Katie McCormick
c8b93fd972 Merge "Doc update: clarify version of flags." into klp-docs 2013-12-16 18:25:12 +00:00