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

101031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
ef459640da am 7ea8b152: am 998cb7d3: am ce861ff3: am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocs 
* commit '7ea8b152ec065f8fc14ee339b7f1de7fffac5d75':
  docs: gms and gcm javadocs
 2013-02-26 02:06:21 +00:00
Dianne Hackborn
efcc1a23a1 App ops: adding operations for reading/writing clipboard. 
Change-Id: Ic4cade153618fe86954754a3b3edde64a52a0a9c
 2013-02-25 18:02:35 -08:00
Robert Ly
7ea8b152ec am 998cb7d3: am ce861ff3: am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocs 
* commit '998cb7d3f0881e41fe9ab0570716fc648c760d9e':
  docs: gms and gcm javadocs
 2013-02-26 02:00:53 +00:00
Robert Ly
998cb7d3f0 am ce861ff3: am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocs 
* commit 'ce861ff3497c28bbddc40ee2232927c2fa3ab489':
  docs: gms and gcm javadocs
 2013-02-25 17:58:23 -08:00
Robert Ly
ce861ff349 am d470874b: am ee46979b: am 05c8e63c: docs: gms and gcm javadocs 
* commit 'd470874be53add0ec46436682b4da46768b82497':
  docs: gms and gcm javadocs
 2013-02-25 17:56:06 -08:00
Robert Ly
d470874be5 am ee46979b: am 05c8e63c: docs: gms and gcm javadocs 
* commit 'ee46979bde5f59fbeccd01e62fb572c66577e21f':
  docs: gms and gcm javadocs
 2013-02-25 17:54:32 -08:00
Michael Wright
5633e23c22 Move stack dump off of InputDispatcher thread 
Change-Id: I7250a0488c3e4c5dc159f4635a57e1e49aa8397a
 2013-02-25 17:52:37 -08:00
Robert Ly
ee46979bde am 05c8e63c: docs: gms and gcm javadocs 
* commit '05c8e63c760eabfbd1cb19d996038c280472c357':
  docs: gms and gcm javadocs
 2013-02-25 17:52:13 -08:00
Eino-Ville Talvala
6609a2db75 am c0e55bd3: Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev 
* commit 'c0e55bd3cfe1d7be2276e4f528fee2231763a5c1':
  Camera and MediaRecorder: Support AppOps
 2013-02-26 01:44:04 +00:00
Eino-Ville Talvala
c0e55bd3cf Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev 2013-02-26 01:36:05 +00:00
Craig Mautner
9b2c1fbb05 am 2e5528c5: (-s ours) Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev 
* commit '2e5528c5e0f354c7b780ca5ab436809efd611dcc':
  Revert ActivityManager changes for tasks. DO NOT MERGE
 2013-02-26 01:14:31 +00:00
Craig Mautner
2e5528c5e0 Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev 2013-02-26 01:08:28 +00:00
Craig Mautner
2ad920759b Revert ActivityManager changes for tasks. DO NOT MERGE 
Keeping all activity=>task changes in master and removing them
from jb-mr2.

Revert "Update histories simultaneously."
Revert "Add null check to setAppGroupId."
Revert "Fix crashing bug in validator."
Revert "Switch topRunning* and moveTaskTo*"
Revert "Begin switch over to task based history."
Revert "Reset and reuse Iterators and don't new() one."
Revert "Remove AppWindowToken lists."
Revert "Fix build."
Revert "Remove unused App methods."
Revert "Stop using AppToken movement and start using Task."
Revert "Replace access to mAppTokens with AppTokenIterator"
Revert "Refactor setAppOpVisibility implementation."
Revert "Add AppWindowTokens to TaskList."
Revert "Make ActivityStack.mHistory private."
Revert "Migrate AppWindowToken lists into DisplayContent."

Change-Id: I5722c9a4956dccb52864207e2967690bc58e4ebb
 2013-02-25 17:07:39 -08:00
Mathias Agopian
c4b44b40f2 am 19a38f6f: Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface" into jb-mr2-dev 
* commit '19a38f6f408d8672ca8d253fb7a6039a7f25c96f':
  Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface
 2013-02-26 01:01:53 +00:00
Mathias Agopian
7e5c769f86 am 89ceb6e2: Merge "regenerate GLES java bindings" into jb-mr2-dev 
* commit '89ceb6e2d9d954c4802b4cf434e1aac4c4a622ef':
  regenerate GLES java bindings
 2013-02-26 00:58:17 +00:00
Mathias Agopian
19a38f6f40 Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface" into jb-mr2-dev 2013-02-26 00:55:25 +00:00
Mathias Agopian
89ceb6e2d9 Merge "regenerate GLES java bindings" into jb-mr2-dev 2013-02-26 00:52:37 +00:00
Mathias Agopian
ffddc9b804 Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface 
also fix a typo that made us call the wrong Surface ctor

Bug: 8225509
Change-Id: I23f92179b6003d4c3e0febb35166c1caeafa27f5
 2013-02-25 16:49:57 -08:00
Mathias Agopian
15284dee8e regenerate GLES java bindings 
- added most missing validation checks
    - glGet* validation reimplement from khronos documentation

    Bug: 7402895

Change-Id: I92a805bb1aba1600d3372dc2db22eab08c975d7f
 2013-02-25 16:48:44 -08:00
Mathias Agopian
ee5cedeca4 Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface" 2013-02-26 00:46:00 +00:00
Mathias Agopian
a35b3a0696 Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface 
also fix a typo that made us call the wrong Surface ctor

Bug: 8225509
Change-Id: I4d6ec342469c1c55f1a2c753a046981f601dc4ca
 2013-02-25 16:42:51 -08:00
Dianne Hackborn
6125c9ba5e am 42bd71e0: Merge "Fix typo." into jb-mr2-dev 
* commit '42bd71e0319e8c38f7439849fef3e8a9111006be':
  Fix typo.
 2013-02-26 00:38:28 +00:00
Dianne Hackborn
42bd71e031 Merge "Fix typo." into jb-mr2-dev 2013-02-26 00:33:32 +00:00
Romain Guy
55a88b0e2b am 8889eb8d: Merge "Rename debug property and expose it in HardwareRenderer" into jb-mr2-dev 
* commit '8889eb8d5161ce760237ae897f1791aaff273757':
  Rename debug property and expose it in HardwareRenderer
 2013-02-26 00:28:40 +00:00
Romain Guy
8889eb8d51 Merge "Rename debug property and expose it in HardwareRenderer" into jb-mr2-dev 2013-02-26 00:22:52 +00:00
Romain Guy
08bca88b27 Rename debug property and expose it in HardwareRenderer 
Change-Id: If46a9bc14a50f6c9a202d901881b36bbac32cba3
 2013-02-25 16:21:30 -08:00
Justin Ho
d2433e19b8 am 51e78360: Merge "Revert "Fix ListView is not scrolled properly with arrows"" into jb-mr2-dev 
* commit '51e7836035c1e5855f9185ba0ade275a52528ace':
  Revert "Fix ListView is not scrolled properly with arrows"
 2013-02-26 00:18:17 +00:00
Justin Ho
51e7836035 Merge "Revert "Fix ListView is not scrolled properly with arrows"" into jb-mr2-dev 2013-02-26 00:12:25 +00:00
Justin Ho
3cf7b3c592 Revert "Fix ListView is not scrolled properly with arrows" 
This reverts commit db68fac12daa2cf4a7568308995e218aed92728a.
 2013-02-25 16:08:27 -08:00
Dianne Hackborn
2f2715bb65 am 035045f8: Merge "Add version code constant for JB MR2." into jb-mr2-dev 
* commit '035045f8bbd54933b50026c7578d814bf3c5fefc':
  Add version code constant for JB MR2.
 2013-02-26 00:02:36 +00:00
Dianne Hackborn
035045f8bb Merge "Add version code constant for JB MR2." into jb-mr2-dev 2013-02-25 23:56:38 +00:00
Dianne Hackborn
45e9ede55f Add version code constant for JB MR2. 
Change-Id: I60fc76bbeb3c5e85d716179e9e3ea5758bafaf69
 2013-02-25 15:55:37 -08:00
Dianne Hackborn
6b9eaf7f50 am a2fcddd1: Merge "Better exceptions when LoadedApk fails." into jb-mr2-dev 
* commit 'a2fcddd1e6537001d76c31730058ea307a5b6070':
  Better exceptions when LoadedApk fails.
 2013-02-25 23:46:37 +00:00
Dianne Hackborn
ec559ff78c Fix typo. 
Change-Id: I71c8458e02dc9b9a4c59e51ded37b57a930038f9
 2013-02-25 15:42:07 -08:00
Dianne Hackborn
a2fcddd1e6 Merge "Better exceptions when LoadedApk fails." into jb-mr2-dev 2013-02-25 23:41:33 +00:00
Elliott Hughes
423f315ab4 am 84952592: am 70347e83: am 8d4d4cf2: Merge "Remove obsolete traceview file format documentation." 
* commit '84952592ee4f736d36fff68c5020443014eaf56c':
  Remove obsolete traceview file format documentation.
 2013-02-25 23:40:35 +00:00
Elliott Hughes
84952592ee am 70347e83: am 8d4d4cf2: Merge "Remove obsolete traceview file format documentation." 
* commit '70347e83525c861379066d2f20c9105cfd284edb':
  Remove obsolete traceview file format documentation.
 2013-02-25 23:35:46 +00:00
Robert Ly
05c8e63c76 docs: gms and gcm javadocs 
Change-Id: I59c11622ee90ec1ce527711afed55818f5818d3f
 2013-02-25 15:31:22 -08:00
Elliott Hughes
70347e8352 am 8d4d4cf2: Merge "Remove obsolete traceview file format documentation." 
* commit '8d4d4cf283d12821caba321204759f2ce3fd210a':
  Remove obsolete traceview file format documentation.
 2013-02-25 15:30:58 -08:00
Romain Guy
c7d05e334e am 279e8c64: Merge "Add new property to debug non-rectangular clip operations" into jb-mr2-dev 
* commit '279e8c64216c1cf8d9f1b53f7d81d863f14e958c':
  Add new property to debug non-rectangular clip operations
 2013-02-25 23:09:12 +00:00
Romain Guy
279e8c6421 Merge "Add new property to debug non-rectangular clip operations" into jb-mr2-dev 2013-02-25 23:03:54 +00:00
Romain Guy
3ff0bfdd14 Add new property to debug non-rectangular clip operations 
This change adds a new property called "debug.hwui.show_stencil_clip"
that accepts the following values:

- "highlight", colorizes in green any drawing command that's tested
  against a non-rectangular clip region
- "region", shows the non-rectangular clip region in blue every time
  it is used
- "hide", default value, nothing is shown

Change-Id: I83c8602310edc4aaeb8b905371cdd185b17d32b5
 2013-02-25 15:01:58 -08:00
Mathias Agopian
ebbf5a1ec4 Merge "regenerate GLES java bindings" 2013-02-25 22:51:48 +00:00
Elliott Hughes
8d4d4cf283 Merge "Remove obsolete traceview file format documentation." 2013-02-25 22:50:51 +00:00
Maggie Benthall
3316f30add am 40bbc3bb: Merge "Add location sharing toggle user restriction." into jb-mr2-dev 
* commit '40bbc3bb9997c6e9ea9aae42edd6bb4430d70978':
  Add location sharing toggle user restriction.
 2013-02-25 21:49:03 +00:00
Craig Mautner
bc8cbe5ce8 Merge "Convert mHistory to mTaskHistory (2)" 2013-02-25 21:46:16 +00:00
Maggie Benthall
40bbc3bb99 Merge "Add location sharing toggle user restriction." into jb-mr2-dev 2013-02-25 21:42:13 +00:00
Geremy Condra
61f542ab95 Merge "Added the KeySetManager." 2013-02-25 21:42:12 +00:00
Romain Guy
25e8804340 am eb9dddbf: Merge "Lookup permission groups by name" into jb-mr2-dev 
* commit 'eb9dddbffb9f2d568d2222454c5dd7582efa819d':
  Lookup permission groups by name
 2013-02-25 21:38:59 +00:00
Romain Guy
eb9dddbffb Merge "Lookup permission groups by name" into jb-mr2-dev 2013-02-25 21:35:29 +00:00