Commit Graph

4277 Commits

Author SHA1 Message Date
Mathias Agopian
3351b988a3 am c7edf2b0: am 0a4962ad: Merge "make Surface.java internal state thread-safe" into jb-mr2-dev
* commit 'c7edf2b033b5119f9a78e48fe07e88e02de84bdc':
  make Surface.java internal state thread-safe
2013-03-20 00:54:40 +00:00
Mathias Agopian
0a4962ad11 Merge "make Surface.java internal state thread-safe" into jb-mr2-dev 2013-03-20 00:23:32 +00:00
Fabrice Di Meglio
a7724c4588 am cfd610ff: am 5054803a: Merge "Add missing ViewDebug infos for View.getTextDirection()" into jb-mr2-dev
* commit 'cfd610ffd9c301740aabd73a980136a8f2f7f481':
  Add missing ViewDebug infos for View.getTextDirection()
2013-03-19 20:51:44 +00:00
Fabrice Di Meglio
5054803a02 Merge "Add missing ViewDebug infos for View.getTextDirection()" into jb-mr2-dev 2013-03-19 20:45:52 +00:00
Fabrice Di Meglio
83f15e657c Add missing ViewDebug infos for View.getTextDirection()
- as getTextDirection() values were not showing in hierarchyviewer

Change-Id: I4ae74963a3c3b350ba996d098e5714b6538d9553
2013-03-19 11:45:56 -07:00
Mathias Agopian
7c116b54b7 make Surface.java internal state thread-safe
it's still incorrect to use Surface from different
threads, however this shouldn't result to native crashes
anymore.

Bug: 8328715
Change-Id: I89ac5cc1218dc5aa0e35f8e6d4737879a442f0c6
2013-03-18 20:29:18 -07:00
Mathias Agopian
e5fd925e8e am ea9758fb: am ab7409e6: Merge "improve SurfaceControl.screenshot documentation" into jb-mr2-dev
* commit 'ea9758fb9d4daf4e2efbb215472e4fa58303b2df':
  improve SurfaceControl.screenshot documentation
2013-03-19 03:24:51 +00:00
Mathias Agopian
49ff2c615e improve SurfaceControl.screenshot documentation
Change-Id: I7e17f69f74df8610b5b85fac0127727df973be42
2013-03-18 20:27:35 +00:00
Craig Mautner
e3a30a0305 Merge "Start moving Tasks from DisplayContent to TaskStack" 2013-03-18 19:20:22 +00:00
Chet Haase
728713258f DO NOT MERGE: ListView transient state fix
ListView child views with transientState (setHasTransientState(true)) are not
handled correctly when the data set changes, such as when an item is added
or removed. The problem is that the transient views are cached by their
position, but this position is out of sync between the ListView and the adapter
until the ListView layout process is complete.

A better way, which unfortunately only works on ListViews with stable IDs, is
to cache the views by their itemID instead, and to use that ID to determine when
and where to reuse/retrieve a transient view during the ListView layout.

Issue #8254775 View.setHasTransient state has side-effects when deleting content in ListView

Change-Id: I2fc25e71ed6655af30b9c3f47fdf014e9b667616
2013-03-18 10:06:27 -07:00
Chet Haase
36350a9592 am fb38986e: am 138c58a9: Merge "Add overlays to views" into jb-mr2-dev
* commit 'fb38986e452a51b6ce37131f293316adedc75ff0':
  Add overlays to views
2013-03-18 14:34:57 +00:00
Chet Haase
138c58a941 Merge "Add overlays to views" into jb-mr2-dev 2013-03-18 14:29:06 +00:00
Craig Mautner
c00204b4d1 Start moving Tasks from DisplayContent to TaskStack
- Create new classes for Stacks on WindowManager.
- Stop using DisplayContent methods and members:
    addAppToken(),
    removeAppToken(),
    setAppTaskId(),
    removeTask(),
    mTaskIdToDisplayContents,
    mTaskIdToTask.
- Start using WindowManagerService.createTask().
- Establish hierarchy of references: AppWindowToken=>Task=>
TaskStack=>StackBox=>DisplayContent.
- Clean up StackBox, TaskStack, and Task.

Change-Id: I798990aa7966784d22f4a43822087d8bb0404dd6
2013-03-15 22:44:29 -07:00
Chet Haase
91cedf1c3d Add overlays to views
It is useful, particularly in animations, to be able to add a view, or at
least some graphics, on top of a view. For example, to have a child of a layout
fade away, we might want to remove the child from that layout and then fade it out
gradually. Meanwhile, we have to have a place to put that view where it will be
drawn. We could do this in the content container sometimes, but this is not a
reliable workaround in the general case, and may obscure other siblings/parents of
the layout/view in the hierarchy. A better approach would be to place a view/graphic
temporarily in the layout itself.

This feature adds the ability to add one or more Views and Drawables to an "overlay"
layer, after which the view will handle drawing that extra content when it redraws itself.

Issue #8350510 Add APIs needed for future animation capabilities

Change-Id: I70bf78c46ee3db8bd87ea1cdc2ecb5c0747ccbf9
2013-03-15 15:53:31 -07:00
Jeff Sharkey
47d07fde90 am 20a1cf34: am 93b04b91: Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev
* commit '20a1cf345f5f7952677d5f9cd97efe1a9a197930':
  Avoid warnings about synthesized IDs.
2013-03-15 21:51:29 +00:00
Jeff Sharkey
93b04b91bc Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev 2013-03-15 21:47:58 +00:00
Jeff Sharkey
47b50333c1 Avoid warnings about synthesized IDs.
Bug: 8153518
Change-Id: I5d638e17581f63c6d4a10ff6bc2c1bf9997a78b3
2013-03-15 14:46:52 -07:00
Fabrice Di Meglio
f72b5c920a am cf60cc9a: am 261f82ca: Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev
* commit 'cf60cc9adedf032c6c97cd2cbb9ff211deaaf3ae':
  Revert "Clean Paint.mBidiFlags as it is no longer used"
2013-03-15 20:39:31 +00:00
Fabrice Di Meglio
261f82ca99 Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev 2013-03-15 20:34:06 +00:00
Fabrice Di Meglio
da12f389eb Revert "Clean Paint.mBidiFlags as it is no longer used"
This reverts commit 6d9fe5bd22.
2013-03-15 11:26:56 -07:00
Chet Haase
d370c54801 am c584f7f4: am b38258f3: Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev
* commit 'c584f7f44e4629e97e662e66f2a135ddb426fc7a':
  Fix erroneous requestLayout-during-layout issues
2013-03-15 14:34:02 +00:00
Chet Haase
b38258f357 Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev 2013-03-15 14:29:41 +00:00
John Spurlock
ca497d3922 am 356bbd1c: am ac3dfb38: Merge "WindowManager.LayoutParams docs cleanup." into jb-mr2-dev
* commit '356bbd1c6046845ebb5f7c8377f5726eb4a1ff0f':
  WindowManager.LayoutParams docs cleanup.
2013-03-14 13:13:46 +00:00
John Spurlock
ac3dfb3880 Merge "WindowManager.LayoutParams docs cleanup." into jb-mr2-dev 2013-03-14 13:08:06 +00:00
Mathias Agopian
9904be3570 am f2362ceb: am b1fa4f92: Merge "fix CloseGuard usage in Surface" into jb-mr2-dev
* commit 'f2362ceb50209dfb72899f9ab1b839e9238ef9a6':
  fix CloseGuard usage in Surface
2013-03-14 02:36:55 +00:00
Chet Haase
107a48236a Fix erroneous requestLayout-during-layout issues
In general, calling requestLayout() during layout is a Bad Idea.
However, ListView does this during the normal course of its layout, as it
removes and adds views during layout. However, it handles this properly,
ensuring that the views in its hierarchy are all measured and laid out
properly by the time its layout process is done.

A previous fix to the request-during-layout issue attempted to distinguish
the correct from incorrect behavior by checking whether views had been properly
laid out since the requestLayout() call, and making sure the views were
visible in the hierarchy (parented, attached, and !GONE), since otherwise
the views would not be laid out, the flags wouldn't be cleared, and requests
are superfluous anyway. However, this logic only checked whether the
requesting views were GONE, whereas the check should include the entire
parent hierarchy of the views (since a view with a GONE parent is still not
visible to the user).

This fix adds that additional check and cleans up other parts of the previous
code, such as not bothering to post() requests that occur during the second
layout pass unless those requests are also valid (coming from visible views).

Issue #8370042 Path seems to be in an infinite layout loop

Change-Id: I7aaf701229adfeee349a9a7c9ec14585735ba9f6
2013-03-13 18:23:44 -07:00
Mathias Agopian
86e1bc7305 fix CloseGuard usage in Surface
Bug: 8375415
Change-Id: I03e9f318c2ad586f4bd93b280557ada66121d275
2013-03-13 18:21:11 -07:00
John Spurlock
33291d8d71 WindowManager.LayoutParams docs cleanup.
Fix a few things found in our "Constants" section.
 - Close unclosed links.
 - Avoid periods inside parens for summary sentences.
 - Lowercasing in a few places for consistency.

Change-Id: I9aa689fd980b373614dae7c4f8257e0786d2340a
2013-03-13 14:45:14 -04:00
Jean Chalard
92291eea07 Merge changes I3109a482,Ia5e25738
* changes:
  Final small cleanup.
  Actually change the place where updateSelection is called
2013-03-12 06:20:59 +00:00
Michael Wright
607dcedaa6 am 63530ed8: am b13eb3e7: Merge changes I674b9804,If2d2e37b into jb-mr2-dev
* commit '63530ed8dad1ca77d5f9d20f2af7317611cdd175':
  Add touch navigation input source
  Add InputDevice#isFromSource convenience method
2013-03-12 01:09:01 +00:00
Michael Wright
e7a9ae8ba0 Add touch navigation input source
Bug: 8276741
Change-Id: I674b9804bf9ae76d694ae7073b54a7d43474a43c
2013-03-11 17:58:22 -07:00
Michael Wright
74e4156e5c Add InputDevice#isFromSource convenience method
Change-Id: If2d2e37bc3fff5a862ea3652c7ef9778018e7ecc
2013-03-11 16:02:51 -07:00
Adam Powell
c6cf2abfdb am 41ac9727: am 15061d74: Merge "Make View#computeOpaqueFlags recognize OUTSIDE_OVERLAY scrollbars" into jb-mr2-dev
* commit '41ac97278f4506e9d06e447b99a94125dc6358db':
  Make View#computeOpaqueFlags recognize OUTSIDE_OVERLAY scrollbars
2013-03-08 01:12:19 +00:00
Adam Powell
f158b52e20 Make View#computeOpaqueFlags recognize OUTSIDE_OVERLAY scrollbars
While the inset scrollbars may change padding and how backgrounds are
drawn such that an otherwise opaque view is no longer opaque. However,
OUTSIDE_OVERLAY scrollbars don't change the padding and should not
affect the determination of opacity.

Change-Id: I8c0c1408aeb540813de3351f0c0d1ad12ba5919c
2013-03-07 12:40:04 -08:00
Dianne Hackborn
32884c376f am 6fea1665: am 1ab64b81: Merge "Add new sample code for writing a ViewGroup." into jb-mr2-dev
* commit '6fea1665a91dafa49b78d1c92c53bb0fa1736020':
  Add new sample code for writing a ViewGroup.
2013-03-07 00:40:44 +00:00
Dianne Hackborn
1ab64b819b Merge "Add new sample code for writing a ViewGroup." into jb-mr2-dev 2013-03-07 00:34:55 +00:00
Dianne Hackborn
7caab0ff2d Add new sample code for writing a ViewGroup.
Change-Id: Id6714b062884c9ed60703e5c199f16683c00a800
2013-03-06 13:47:04 -08:00
John Spurlock
4a682c2c8f Merge "Quick typo fix to View.java docs." 2013-03-06 18:39:33 +00:00
John Spurlock
7eae2d5d97 Quick typo fix to View.java docs.
navagation -> navigation

Change-Id: I0afd46824afc9a9aedcfc383e633b4bed6b28918
2013-03-06 12:57:05 -05:00
Mathias Agopian
3205ebf67b am 563c374f: am f4d6f153: Merge "remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT" into jb-mr2-dev
* commit '563c374faf2c9e2741e0c73edff22237aa0562e5':
  remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT
2013-03-06 16:53:51 +00:00
Jean Chalard
aaf8671c43 Final small cleanup.
This does not change anything in the practice since the only
time where timing of the endBatchEdit() call matters is when
sendCurrentText is a no-op. Still, it's theoretically correct
to do it in this order.
This concludes a four-step refactoring moving where the
editor calls updateSelection to warn the IME of a cursor move.

Change-Id: I3109a482ec1d4cd9b4ffb33cc363a4ce5128861a
2013-03-05 20:36:24 -08:00
Mathias Agopian
f4d6f153e6 Merge "remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT" into jb-mr2-dev 2013-03-06 03:52:50 +00:00
Mathias Agopian
11e7d88d14 remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT
the window manager can now use the SurfaceControl.screenshot
API with a "regular" surface.

Change-Id: I76bed81d5e7b078ea1b3e8f96814aba32e9d5405
2013-03-05 14:14:55 -08:00
Dianne Hackborn
ee61a7fb95 am 530b2b1c: am a5513616: Merge "Add new WindowId for cross-process monitoring of focus." into jb-mr2-dev
* commit '530b2b1c98e3a3d86fd90cd91a08005370b8aa49':
  Add new WindowId for cross-process monitoring of focus.
2013-03-05 21:08:13 +00:00
Dianne Hackborn
a55136169e Merge "Add new WindowId for cross-process monitoring of focus." into jb-mr2-dev 2013-03-05 17:37:43 +00:00
Dianne Hackborn
e3f23a36d8 Add new WindowId for cross-process monitoring of focus.
This is a class representing a window and providing limited
interaction with it, which can be handed across processes.

Change-Id: I22885f2064a9cc8c68d690a5858c2e28bbb6a0f3
2013-03-05 09:33:48 -08:00
Chet Haase
573596de3b Merge "ListView transient state fix" 2013-03-05 14:26:35 +00:00
Romain Guy
4001b31cba am 370929f4: am d23b2747: Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev
* commit '370929f4bf6b9d7a196eae531f38cdec19140dfd':
  Finish current Canvas operations then resume previous Canvas Bug #8297260
2013-03-05 03:15:37 +00:00
Romain Guy
d23b2747ef Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 2013-03-05 03:11:11 +00:00
Romain Guy
e78b8003a5 Finish current Canvas operations then resume previous Canvas
Bug #8297260

Change-Id: Ia30bb61ff5db805ec5d57f5e4c22c275f649ecdb
2013-03-04 19:08:02 -08:00