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

100943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
94e512f13d am 30a51b3f: Merge "Spurious file removed." into jb-mr2-dev 
* commit '30a51b3f01ceee9f17ba4070e518b1829e32063d':
  Spurious file removed.
 2013-02-26 16:47:29 +00:00
Daniel Sandler
30a51b3f01 Merge "Spurious file removed." into jb-mr2-dev 2013-02-26 16:41:16 +00:00
Robert Ly
dce8e8087a am c6a983c6: am a1ee7539: am c6793135: am 1d13e850: am 928f6382: am af7b843e: docs: remove games references 
* commit 'c6a983c629e156800fa1cb4c2cf3823becc83b5e':
  docs: remove games references
 2013-02-26 16:13:35 +00:00
Robert Ly
c6a983c629 am a1ee7539: am c6793135: am 1d13e850: am 928f6382: am af7b843e: docs: remove games references 
* commit 'a1ee7539ff07fb5b6ad9244e3e9fa66106962b93':
  docs: remove games references
 2013-02-26 16:08:54 +00:00
Robert Ly
a1ee7539ff am c6793135: am 1d13e850: am 928f6382: am af7b843e: docs: remove games references 
* commit 'c679313559e90f0c35f15e1b5070c277ada981d3':
  docs: remove games references
 2013-02-26 08:07:45 -08:00
Robert Ly
c679313559 am 1d13e850: am 928f6382: am af7b843e: docs: remove games references 
* commit '1d13e85031eff239e035afb1ff474502caf01104':
  docs: remove games references
 2013-02-26 08:04:45 -08:00
Robert Ly
1d13e85031 am 928f6382: am af7b843e: docs: remove games references 
* commit '928f6382eb4ac0b6ea3f5141ba297412e26d8fe6':
  docs: remove games references
 2013-02-26 08:02:43 -08:00
Robert Ly
928f6382eb am af7b843e: docs: remove games references 
* commit 'af7b843e97d5228bf8cc57aa37acf6c7d58464e8':
  docs: remove games references
 2013-02-26 08:00:38 -08:00
Daniel Sandler
4d85af68a4 Spurious file removed. 
Change-Id: I2ac3f417553aea806ad570e247afc985e9ececb3
 2013-02-26 10:51:45 -05:00
Robert Ly
af7b843e97 docs: remove games references 
Change-Id: I32f25b692872ed7827e611890c563498993b2480
 2013-02-26 07:49:56 -08:00
Ben Murdoch
97786e14c0 Merge "Update WebView#loadDataWithBaseURL documentation." 2013-02-26 12:08:49 +00:00
Robert Ly
e9d7348d7a am 60e37947: am c1da3af5: am 9e49d2af: am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '60e37947f7de7289c0c973bb8e97c0de65ee3f4c':
  docs: gms cheddar updates for g+
 2013-02-26 06:16:10 +00:00
Robert Ly
60e37947f7 am c1da3af5: am 9e49d2af: am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit 'c1da3af593cb78843d7f8375c09b4f91b6f1e742':
  docs: gms cheddar updates for g+
 2013-02-26 06:10:47 +00:00
Robert Ly
c1da3af593 am 9e49d2af: am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '9e49d2af7289ff7f7c96568f6c41cb22295e4613':
  docs: gms cheddar updates for g+
 2013-02-25 22:09:25 -08:00
Robert Ly
9e49d2af72 am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '045bede816c6578379911567f68046393f70247c':
  docs: gms cheddar updates for g+
 2013-02-25 22:08:19 -08:00
Robert Ly
045bede816 am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '4240da1a888edca033ca10b6995ea9c7df5c7e5b':
  docs: gms cheddar updates for g+
 2013-02-25 22:07:03 -08:00
Robert Ly
4240da1a88 am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 
* commit '7cbf2bc6810ca4623d990258823d25e307ebbfd7':
  docs: gms cheddar updates for g+
 2013-02-25 22:03:41 -08:00
Robert Ly
7cbf2bc681 Merge "docs: gms cheddar updates for g+" into jb-mr1-dev 2013-02-26 05:59:50 +00:00
Robert Ly
32c0cacf14 docs: gms cheddar updates for g+ 
Change-Id: I7ffd94fa17f0911f83e0c40462861a9e6080a197
 2013-02-25 20:44:05 -08:00
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
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
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