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

108405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
144a6ae7e6 Fix build. 
Change-Id: Icdfc6bcbe8603cf9bd3f8982a595336c0407e7d6
 2013-06-24 12:25:57 -07:00
Craig Mautner
7a78b39428 Merge "Fix unnecessary and harmful task movement." 2013-06-24 18:38:11 +00:00
Svetoslav
cf165a0ae0 Merge "Print APIs documentation update" 2013-06-24 18:34:33 +00:00
Craig Mautner
07f36c738e Merge "Add activity token to display system." 2013-06-24 18:31:54 +00:00
Craig Mautner
f0ac5c87f2 Fix unnecessary and harmful task movement. 
Changing the focus to a new activity should not move it to the top of
the task stack. When the previous activity fully pauses and the new
focused activity resumes then it will be brought to the top of the
task stack at the proper time. Moving it there prematurely causes the
ActivityManager and WindowManager stack sequences to be out of sync.

Fixes bug 9518153.

Also remove false warnings in validateTopActivitiesLocked() and add
debug for task movement to TaskStack.

Change-Id: Ib57500b07ded97223155cda7ef603aecc9b642c3
 2013-06-24 11:29:09 -07:00
Andy McFadden
066bdcfe83 Merge "Fix wrapper equals()" 2013-06-24 17:42:25 +00:00
Alan Viverette
db759c3f02 Merge "Implement FastScroller as an animated overlay." 2013-06-24 17:23:19 +00:00
Chet Haase
edaf0794bb Merge "Fix ViewGroupOverlay's handling of invalidating viewgroups" 2013-06-24 16:37:55 +00:00
Svetoslav
fd90651cfc Print APIs documentation update 
Change-Id: I0df438e45ef540cc42c9ee5baafc816ebafa1c7b
 2013-06-24 09:05:38 -07:00
Andy McFadden
b32a7c7ca2 Merge "Minor fixes to android.opengl.Matrix" 2013-06-24 14:26:18 +00:00
Dirk Dougherty
5d87c166f4 am 66e9a009: am d73e151e: am 3d1c9b07: am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit '66e9a009771c7e7a4fb48ba872b87009758f6d51':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:47:41 -07:00
Dirk Dougherty
66e9a00977 am d73e151e: am 3d1c9b07: am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit 'd73e151eaca8615015948d535d90397c8719c5f4':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:45:36 -07:00
Dirk Dougherty
d73e151eac am 3d1c9b07: am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit '3d1c9b0710efa265e1ead34ee48a487c5ad4f66f':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:42:27 -07:00
Dirk Dougherty
3d1c9b0710 am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit 'eadad05c341b418cfe6249fb16d91951a3432c8a':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:39:52 -07:00
Dirk Dougherty
eadad05c34 am d8dff038: am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit 'd8dff038f9368decd5a9e1176e453a24e4309290':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:37:52 -07:00
Dirk Dougherty
d8dff038f9 am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit '1c77f5e2757e589bfc8c1e89e6394504f576ac52':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:34:48 -07:00
Dirk Dougherty
1c77f5e275 am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit '1c1113958d4e27018b02ce793809d541158440f6':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:32:54 -07:00
Dirk Dougherty
1c1113958d am 8451fc4f: Doc change: edits to education opt-in docs. 
* commit '8451fc4f8660842b21e4ed3bddaedb0eb9490855':
  Doc change: edits to education opt-in docs.
 2013-06-24 01:30:58 -07:00
Dirk Dougherty
8451fc4f86 Doc change: edits to education opt-in docs. 
Change-Id: I258a8f89c3bdbb6b5dabfe96cc7dd66dd16b8052
 2013-06-24 00:58:04 -07:00
Dirk Dougherty
aae7f90d58 am 0d4adbe0: am 0efa541a: am 6561c275: am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '0d4adbe0a3ba69ddc348cf086b2357cf27ff10d6':
  Doc change: add docs for edu opt-in.
 2013-06-23 22:36:05 -07:00
Craig Mautner
fb1e20dfe2 Don't move stack with task for moveTaskToFront. 
Earlier CL, ag/321609, was overly aggressive. It should only have kept
the stack from moving when moveTaskToStack() was called. Instead the
change was applied to moveTaskToFront() as well. In order to remain
consistent with earlier behavior of moveTaskToFront() the stack
containing the task must move to the front as well. This movement
launches the activity at the top of the task. Without the stack
movement the activity never gets launched causing bug 9498455.

Fixes bug 9498455.

Change-Id: I2cb9119c23a226f7d211851df9e49f10f702b3ef
 2013-06-23 21:28:10 -07:00
Dirk Dougherty
0d4adbe0a3 am 0efa541a: am 6561c275: am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '0efa541a0156396290e03c82c8b28326380c9e4a':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:53:00 -07:00
Dirk Dougherty
0efa541a01 am 6561c275: am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '6561c27519d710e79a7b2d15e29fcccb2f714c94':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:50:32 -07:00
Dirk Dougherty
6561c27519 am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '6755a4d433d44506abd932b62f6552fa37bf1dd9':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:45:02 -07:00
Dirk Dougherty
6755a4d433 am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '757b943a92d23c255dcca15944908f105265a86b':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:42:58 -07:00
Dirk Dougherty
757b943a92 am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit 'b2e3fb4f37e6cf0e2c9e3aa00facfac9fbd4e22d':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:41:29 -07:00
Dirk Dougherty
b2e3fb4f37 am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '9db291583a90babbcb6db6f2b82276f5657a3503':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:39:30 -07:00
Dirk Dougherty
9db291583a am f812258e: Doc change: add docs for edu opt-in. 
* commit 'f812258e5ca9449402781a7330c0e3696f566e09':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:37:14 -07:00
Dirk Dougherty
f812258e5c Doc change: add docs for edu opt-in. 
Change-Id: Ieb9f77e3efd64c42c719167dd6e6c6d7360bcfa4
 2013-06-23 19:33:00 -07:00
Craig Mautner
48d0d18867 Add activity token to display system. 
First step in adding activity specific information to displays.
Replace CompatibilityInfoHolder with DisplayAdjustmentsHolder that
holds an activity token in addition to the CompatibilityInfo.

Change-Id: Ie113cd8dd9c62e0b5311204e039a4829096bea68
 2013-06-22 15:30:13 -07:00
Svetoslav
53f57d162b Print API tweaks. 
Change-Id: I4fcf93f17495740e8b8d0dc4e425a89862716b42
 2013-06-22 00:26:49 -07:00
Scott Main
1cda4dc1d7 am 83006f51: am aa837ded: am 86c9d47c: update homepage carousel for jelly bean 3.0 
* commit '83006f5197f9acd999b9ab5c38d0ec6342787cfb':
  update homepage carousel for jelly bean 3.0
 2013-06-21 21:02:37 -07:00
Scott Main
83006f5197 am aa837ded: am 86c9d47c: update homepage carousel for jelly bean 3.0 
* commit 'aa837dedf85eabde76cf8d5ec57e42f78832e8a6':
  update homepage carousel for jelly bean 3.0
 2013-06-21 20:51:37 -07:00
Scott Main
581395a931 am be467349: am c2d92db8: am bcd6f76a: Merge "typo" into jb-mr2-dev 
* commit 'be4673494dda3072dd1cea9a968f4524100f382c':
  typo
 2013-06-21 20:48:32 -07:00
Scott Main
aa837dedf8 am 86c9d47c: update homepage carousel for jelly bean 3.0 
* commit '86c9d47cb7a1e2b3868e0152f1df9ef335555f52':
  update homepage carousel for jelly bean 3.0
 2013-06-21 20:44:39 -07:00
Scott Main
86c9d47cb7 update homepage carousel for jelly bean 3.0 
Change-Id: Ie698493e4da0232b67630f92e80bf025be24884a
 2013-06-21 20:39:41 -07:00
Scott Main
be4673494d am c2d92db8: am bcd6f76a: Merge "typo" into jb-mr2-dev 
* commit 'c2d92db8c0ca3d9d045f5f710f4d90db8684b439':
  typo
 2013-06-21 20:33:24 -07:00
Scott Main
0979239a25 am 73c1882f: am 90e2e8db: am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev 
* commit '73c1882fd8243ded351c453c98d2b8c6fba7dba8':
  add jb-mr2 api overview
 2013-06-21 20:32:35 -07:00
Scott Main
c2d92db8c0 am bcd6f76a: Merge "typo" into jb-mr2-dev 
* commit 'bcd6f76ac9ebcf1745f1cfce975d8e9835cd4bab':
  typo
 2013-06-21 20:30:12 -07:00
Scott Main
73c1882fd8 am 90e2e8db: am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev 
* commit '90e2e8db2f74b25cff0cfe7e59f88a37d49da3a8':
  add jb-mr2 api overview
 2013-06-21 20:28:09 -07:00
Scott Main
bcd6f76ac9 Merge "typo" into jb-mr2-dev 2013-06-22 03:26:27 +00:00
Scott Main
90e2e8db2f am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev 
* commit '4129cfe1e4abf2366e395f36804a866b13241d28':
  add jb-mr2 api overview
 2013-06-21 20:25:45 -07:00
Scott Main
1c62a0fc32 typo 
Change-Id: I4dcb7c67313a8e3f42ae9f56e4c0ce6e5874dfc7
 2013-06-21 20:25:23 -07:00
Scott Main
4129cfe1e4 Merge "add jb-mr2 api overview" into jb-mr2-dev 2013-06-22 03:23:50 +00:00
Scott Main
8cc7db7d40 add jb-mr2 api overview 
Change-Id: Ib46c3ad3318d19927f47f1bb0ada93adf7766147
 2013-06-21 20:20:40 -07:00
Svetoslav Ganov
352e4b5b3a Merge "Print - platform APIs" 2013-06-22 01:44:35 +00:00
Svetoslav Ganov
4b9a4d1687 Print - platform APIs 
Related changes:
    Skia (inlcude PDF APIs): https://googleplex-android-review.googlesource.com/#/c/305814/
    Canvas to PDF: https://googleplex-android-review.googlesource.com/#/c/319367/
    Settings (initial version): https://googleplex-android-review.googlesource.com/#/c/306077/
    Build: https://googleplex-android-review.googlesource.com/#/c/292437/
    Sample print services: https://googleplex-android-review.googlesource.com/#/c/281785/

Change-Id: I104d12efd12577f05c7b9b2a5e5e49125c0f09da
 2013-06-21 18:43:17 -07:00
Chet Haase
e4a2d7c48e Fix ViewGroupOverlay's handling of invalidating viewgroups 
Invalidating a view property (alpha, rotation, etc.) causes an
invalidation process that does not work correctly when the view is
in a ViewOverlay. Specifically, if the view is not directly in the
overlay, but is instead inside a hierarchy which is within the overlay,
then the invalidation process stops at the ViewOverlay itself, because
the ViewOverlay has no "parent" view.

The fix is to override the invalidateChildInParentFast() method, just
like we override invalidateChildInParent(), to forward the invalidation
to the host view.

Issue #9389230 Animations not running for nested views under ViewGroupOverlay

Change-Id: I03fcef10ed1c8a91cb26d5d9d6945634b0b695b5
 2013-06-21 17:49:36 -07:00
Geremy Condra
466606f1fd Merge "Remove logging of KeySet parse errors." 2013-06-22 00:41:53 +00:00
Alan Viverette
0ebe81e8b1 Implement FastScroller as an animated overlay. 
Bug: 9372090
Change-Id: I46cb67ef0482a4c8f721248d5f5e2e692144c3a1
 2013-06-21 17:01:36 -07:00