Commit Graph

31121 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
Craig Mautner
9b93c2c9cc Merge "Clear mWindowAdded when window was not added." 2013-03-20 00:03:34 +00:00
Craig Mautner
dd8c10b855 Merge "Clear mWindowAdded when window was not added. DO NOT MERGE" into jb-mr2-dev 2013-03-20 00:00:17 +00:00
Craig Mautner
f403b1fe50 Clear mWindowAdded when window was not added. DO NOT MERGE
If ViewRootImpl throws BadTokenException when adding a window, clear
the indication that a window has been added. That way when the
window is destroyed it doesn't try to clean it up.

Fixes bug 8409506.

Change-Id: I270740762f21ed4ec7f235344a3adaeaa033c483
2013-03-19 16:58:00 -07:00
Craig Mautner
765ecefd2a Clear mWindowAdded when window was not added.
If ViewRootImpl throws BadTokenException when adding a window, clear
the indication that a window has been added. That way when the
window is destroyed it doesn't try to clean it up.

Fixes bug 8409506.

Change-Id: I270740762f21ed4ec7f235344a3adaeaa033c483
2013-03-19 16:54:35 -07: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
Elliott Hughes
a25731f87d am 96112802: am 80828f46: am c1562075: am ebebb80b: Merge "Remove dead code from DateUtils."
* commit '96112802bc1f37e2f5c75c53b919231a61866bd2':
  Remove dead code from DateUtils.
2013-03-19 19:31:10 +00:00
Elliott Hughes
80828f465a am c1562075: am ebebb80b: Merge "Remove dead code from DateUtils."
* commit 'c1562075b0be58fa9dd09c2f2e9fa45601088574':
  Remove dead code from DateUtils.
2013-03-19 12:27:10 -07:00
Elliott Hughes
c1562075b0 am ebebb80b: Merge "Remove dead code from DateUtils."
* commit 'ebebb80b4a629756128b5a4fcf483133f01dbfd7':
  Remove dead code from DateUtils.
2013-03-19 12:24:50 -07: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
Elliott Hughes
9a6fa1d637 Remove dead code from DateUtils.
This stuff is @hide, @deprecated, unused, and was never in any API level.

Change-Id: I87d132d77d7296a2de8527e05c2def362cab1c37
2013-03-19 11:36:12 -07:00
Fabrice Di Meglio
0d84e72566 am 430058f2: am 2d18e52b: Merge "Fix bug #8335710 TextView can\'t clear CompoundDrawables" into jb-mr2-dev
* commit '430058f2699041e86d7c0e50cad1fa6989d08cab':
  Fix bug #8335710 TextView can't clear CompoundDrawables
2013-03-19 17:43:45 +00:00
Fabrice Di Meglio
2d18e52b00 Merge "Fix bug #8335710 TextView can't clear CompoundDrawables" into jb-mr2-dev 2013-03-19 17:39:11 +00:00
Elliott Hughes
d81830d67e am 110a98b6: am f7c01e5a: am eda35cb7: am a8974d3f: Merge "Clean up (some of) our many clocks to use H instead of k."
* commit '110a98b67285ec213720c542e6fb4711d9fd3114':
  Clean up (some of) our many clocks to use H instead of k.
2013-03-19 16:35:46 +00:00
Elliott Hughes
182af50b2c am 561a0ef4: am c3e513e5: am c5c6d416: am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for compatibility."
* commit '561a0ef4bf4153960d5796cd74d6cc9c8405843d':
  Deliberately break DateFormat.format's formatting of 'k' for compatibility.
2013-03-19 16:35:37 +00:00
Elliott Hughes
f7c01e5a8a am eda35cb7: am a8974d3f: Merge "Clean up (some of) our many clocks to use H instead of k."
* commit 'eda35cb7c5781a32b038f1ef76b8e50f26f9bfaf':
  Clean up (some of) our many clocks to use H instead of k.
2013-03-19 09:31:04 -07:00
Elliott Hughes
c3e513e51c am c5c6d416: am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for compatibility."
* commit 'c5c6d4167b66c79652c5208a2dfe091a8c735e6d':
  Deliberately break DateFormat.format's formatting of 'k' for compatibility.
2013-03-19 09:30:51 -07:00
Chet Haase
92eb0073bf am 58afb2f0: am f4071065: Merge "Fix bug with transientState for listviews without stable IDs" into jb-mr2-dev
* commit '58afb2f0501b22d020ac1fc1a116baec21765e3c':
  Fix bug with transientState for listviews without stable IDs
2013-03-19 13:12:40 +00:00
Chet Haase
f4071065b8 Merge "Fix bug with transientState for listviews without stable IDs" into jb-mr2-dev 2013-03-19 13:06:56 +00: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
ab7409e637 Merge "improve SurfaceControl.screenshot documentation" into jb-mr2-dev 2013-03-19 03:20:11 +00:00
Fabrice Di Meglio
f7a5cdfac6 Fix bug #8335710 TextView can't clear CompoundDrawables
- fix start/override mechanism
- take care of RTL compatibility mode (pre JB-MR1)
- fix where reset of drawables resolution needs to happen

Change-Id: I55a69487a0eedee14c4be7006ee0abad085200ad
2013-03-18 18:13:16 -07:00
Elliott Hughes
eda35cb7c5 am a8974d3f: Merge "Clean up (some of) our many clocks to use H instead of k."
* commit 'a8974d3f0a799a5d76e226649c878a71b3b5e953':
  Clean up (some of) our many clocks to use H instead of k.
2013-03-18 17:49:47 -07:00
Elliott Hughes
cdafd37f31 Clean up (some of) our many clocks to use H instead of k.
Bug: 8359981
Change-Id: I3c0c38c2bf5adc4b5bdc11c3d10cf41dd8fb6462
2013-03-18 17:21:33 -07:00
Elliott Hughes
c5c6d4167b am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for compatibility."
* commit '6317315e733f115aa6ad0339c1a334607fd04342':
  Deliberately break DateFormat.format's formatting of 'k' for compatibility.
2013-03-18 15:24:31 -07:00
Elliott Hughes
fc55c2ba49 Deliberately break DateFormat.format's formatting of 'k' for compatibility.
Bug: 8359981
Change-Id: I44ed816c644f94783c77952d544c5444b966868b
2013-03-18 14:59:59 -07:00
Chet Haase
a2230e1856 Fix bug with transientState for listviews without stable IDs
This is the other part of a fix with transient state. A layout container
may be out of sync with its adapter during a data change. When the transient
state views are managed by their positions, and these positions may not match
between the container and the adapter, then the views will not be updated
correctly on the screen (though the underlying data will still be correct).

An earlier fix addressed the problem when the adapter has stable IDs (managing
the transient views by their IDs instead of their positions). This fix addresses
the other part of the problem, simply avoiding managing via positions during
a data change.

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

Change-Id: I0fe1692a1507a042180f8a14a8ef2d0c6946a061
2013-03-18 14:52:37 -07:00
Svetoslav Ganov
b002104350 am 3405dac2: am e4c9ac2d: Merge "Remember which list child has A11y focus BEFORE clearing A11y focus." into jb-mr2-dev
* commit '3405dac287580e65d74a2fd8e6d2bffd85420bf0':
  Remember which list child has A11y focus BEFORE clearing A11y focus.
2013-03-18 21:29:18 +00:00
Svetoslav Ganov
e4c9ac2df2 Merge "Remember which list child has A11y focus BEFORE clearing A11y focus." into jb-mr2-dev 2013-03-18 21:23:45 +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
Wink Saville
c7fd2e9f7f am 16489892: am b8c5ce29: Merge "Add new StateMachine constructor with name and handler params." into jb-mr2-dev
* commit '1648989280877426b32147d83f0f330e62bd7da1':
  Add new StateMachine constructor with name and handler params.
2013-03-17 21:33:30 +00:00
Wink Saville
b8c5ce29dc Merge "Add new StateMachine constructor with name and handler params." into jb-mr2-dev 2013-03-17 21:27:19 +00:00
Wink Saville
24d248acdf Add new StateMachine constructor with name and handler params.
Change-Id: Ic252de6cac24a043050b37d81767d19e2739b2fc
2013-03-17 14:26:21 -07: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
Robert Greenwalt
03fd756f2a am 06656913: am ab672ba6: Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev
* commit '0665691376c3df35e55e8f2b72d674ccaa948a9d':
  Revert of Ifd0c4081a.  Turning off logging.
2013-03-15 23:36:02 +00:00
Robert Greenwalt
ab672ba664 Merge "Revert of Ifd0c4081a. Turning off logging." into jb-mr2-dev 2013-03-15 23:30:59 +00:00
Dianne Hackborn
1545d7c5f7 am 5e2552bd: am d468df73: Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev
* commit '5e2552bd16ae09da826270363ac0f3f56af91922':
  Fix a bug where we could lose a loader content change.
2013-03-15 23:14:17 +00:00
Dianne Hackborn
d468df73d5 Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev 2013-03-15 23:10:47 +00:00
Chet Haase
cbd449e2e6 am 08e84b6b: am 30527267: Merge "Reset reverse state when an animator ends" into jb-mr2-dev
* commit '08e84b6b7d6a7eb6f14a731767caafecb78238e6':
  Reset reverse state when an animator ends
2013-03-15 22:55:17 +00:00
Chet Haase
55161629f5 am 1c9f5875: am 2de8dac8: Merge "Log warning when animator detects NaN value" into jb-mr2-dev
* commit '1c9f587582c584958af2d78bbc76a7dac9f2c6fc':
  Log warning when animator detects NaN value
2013-03-15 22:55:14 +00:00
Chet Haase
b966327170 am e7955865: am d2e1e447: Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev
* commit 'e7955865a17e3065bcaf56fa57bec0346ecc8d21':
  Use same default duration (300) for animator resources as for other animators
2013-03-15 22:55:12 +00: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
Chet Haase
30527267d1 Merge "Reset reverse state when an animator ends" into jb-mr2-dev 2013-03-15 22:51:07 +00:00