Commit Graph

3837 Commits

Author SHA1 Message Date
Romain Guy
a7bf9d363a Merge "Reduce the number of measurement passes in RelativeLayout" 2013-05-11 00:59:11 +00:00
Romain Guy
4cb81d6423 Reduce the number of measurement passes in RelativeLayout
Change-Id: I96ad8676f6344a1e0877f9dfbe782747bc0ff36d
2013-05-10 17:58:44 -07:00
Svetoslav
6f3a6a453a am 1e4c6589: am b3c2b21b: Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev
* commit '1e4c6589941e459871eed6e9d4675b05d977325c':
  Accessibility should not query for list items when data set changed.
2013-05-10 15:16:57 -07:00
Svetoslav
1e4c658994 am b3c2b21b: Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev
* commit 'b3c2b21b5ba30d82938ae2ef93d8120f5fd0cc80':
  Accessibility should not query for list items when data set changed.
2013-05-10 13:10:41 -07:00
Svetoslav
b3c2b21b5b Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev 2013-05-10 20:06:42 +00:00
Marco Nelissen
c08d4d99e2 am 1d3488cb: am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev
* commit '1d3488cba90bea114c9c5e8f0d4a008d2aa34bfd':
  Add VideoView.getAudioSessionId()
2013-05-10 12:46:36 -07:00
Marco Nelissen
1d3488cba9 am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev
* commit '86e0b491d1b50e59221420de3005184b1dee8373':
  Add VideoView.getAudioSessionId()
2013-05-10 12:44:05 -07:00
Marco Nelissen
13bfebd6b7 Add VideoView.getAudioSessionId()
This lets apps get the audio session id of the video being played, so
they can apply effects to the audio track.
b/8767565

Change-Id: Iaa39d97d0b6fb528ed04b52d579afa58444ebcfe
2013-05-09 15:50:38 -07:00
Svetoslav
5b578daac9 Accessibility should not query for list items when data set changed.
AbsListView is backed by an adapter. After the adapter data changes
the view sets a flag that its state is dirty and requests a layout.
If an accessibility service asks for the state of a list item at
this point, it may incur an error since the views and the adapter
are not in sync.

Now if an accessibility service queries for a list item when the
data set is changed and the item views are dirty, we pretend the
children do not exist. After the layout happens, we notify the
accessibility layer that the screen content changed so it can
refetch the views if desired (this notification mechanism is
already in place in AbsListView#handleDataChanged()).

bug:8433433

Change-Id: I4287a0ac2ef6bb33f1f988d5ddad973556c305ca
2013-05-08 14:23:38 -07:00
Dianne Hackborn
3aa49b6fec New UndoManager.
Basic implementation of an undo manager.  Supports
multi-level undo/redo, building on the top undo state
as edits occur, managing multiple distinct entities in
the undo state (such as embedded objects in a document),
and saving/restoring the full undo state.  Still some
work remaining on correctly dealing with dependencies
between undo states that hold multiple owners.

Also do a simple implementation of undo state in TextView
to see how things actually work.  The implementation here
is very primitive: it needs a lot more work to correctly
identify when to merge undo ops, is not trying to do
anything smart with style spans, etc.

Change-Id: Ie30f4e133351e2f569ffb48c6c44a2b19cadee27
2013-05-07 15:05:09 -07:00
Elliott Hughes
c3bc1b671e am c255800f: am 6d82f86f: Merge "Show CJK dates as all-numeric in the DatePicker."
* commit 'c255800fb0f46ea5f68d2c145605ac7dcd3a89b6':
  Show CJK dates as all-numeric in the DatePicker.
2013-05-01 14:56:59 -07:00
Elliott Hughes
c255800fb0 am 6d82f86f: Merge "Show CJK dates as all-numeric in the DatePicker."
* commit '6d82f86fa01800ee0523743366e0dc1113178fd9':
  Show CJK dates as all-numeric in the DatePicker.
2013-05-01 14:53:28 -07:00
Elliott Hughes
949e9df25b Show CJK dates as all-numeric in the DatePicker.
Before, we'd have something like 2006 4月12. After, we have 2006 4 12.
The alternative would require using custom NumberPicker.Formatter instances
for the year and day fields in these locales, and that seems significantly
more disruptive.

Bug: 8766552
Change-Id: I568578aae2f80f2acfc53cd277ef3beae6743472
2013-05-01 14:12:05 -07:00
Elliott Hughes
a5e5196bec am 76c643c9: am e3f2735f: Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
* commit '76c643c9b600ef31c22f807c2874c879a7fa5069':
  when locale is non-Enligh, sometimes month spinner needs a number IME
2013-04-30 13:23:17 -07:00
Romain Guy
0520146c41 am 55828af2: am 6628ee7a: Merge "HeaderViewListAdapter: Correct thrown error names."
* commit '55828af26ce0090c6c80a300d27d1064ce1b74c6':
  HeaderViewListAdapter: Correct thrown error names.
2013-04-30 13:23:15 -07:00
Elliott Hughes
76c643c9b6 am e3f2735f: Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
* commit 'e3f2735fcfd8dafd226200d5cf219a6f82c9cc0c':
  when locale is non-Enligh, sometimes month spinner needs a number IME
2013-04-30 13:21:22 -07:00
Romain Guy
55828af26c am 6628ee7a: Merge "HeaderViewListAdapter: Correct thrown error names."
* commit '6628ee7a46a56cdc28d409e6fd74afc34bd24c5b':
  HeaderViewListAdapter: Correct thrown error names.
2013-04-30 13:21:19 -07:00
Elliott Hughes
e3f2735fcf Merge "when locale is non-Enligh, sometimes month spinner needs a number IME" 2013-04-30 20:11:50 +00:00
Elliott Hughes
31872fd7ce am a99595a3: am afe56810: Merge "Fix DatePicker\'s spinner order in various locales."
* commit 'a99595a393341b6a130e202bc9e93848ee53057b':
  Fix DatePicker's spinner order in various locales.
2013-04-30 12:17:27 -07:00
Elliott Hughes
a99595a393 am afe56810: Merge "Fix DatePicker\'s spinner order in various locales."
* commit 'afe56810517a4ddfad125029ca04fd4cc5af2ef5':
  Fix DatePicker's spinner order in various locales.
2013-04-30 12:15:06 -07:00
Romain Guy
6628ee7a46 Merge "HeaderViewListAdapter: Correct thrown error names." 2013-04-30 19:11:22 +00:00
Taylor H. Perkins
62b2bb80f6 HeaderViewListAdapter: Correct thrown error names.
When accessing an invalid entry of the list, an IndexOutOfBounds exception is thrown, not an ArrayIndexOutOfBounds exception.

Change-Id: I3cf59faab004fa6391d84f30f280e0c9bd92dc44
Signed-off-by: Taylor H. Perkins <taylorhp@gmail.com>
2013-04-30 12:04:52 -07:00
Romain Guy
9e37d590a6 Merge "Fix TextClock documentation Bug #8670351" 2013-04-30 18:31:29 +00:00
Romain Guy
09b1994c4d Fix TextClock documentation
Bug #8670351

Change-Id: I87a906b85b51f44d9dcecb6f137db53886323ad7
2013-04-30 11:19:39 -07:00
Elliott Hughes
659f145278 Fix DatePicker's spinner order in various locales.
DatePicker always effectively uses yyyy MMM dd, so we need to ask
icu4c what order those should appear in for the user's locale. The
existing DateFormat code was an approximation that worked for en_US
but not for all languages (fa being one example).

Bug: 7207103
Change-Id: I7b12568dbc02522ebad6e1db5f8426109cd6f7ce
2013-04-30 11:11:53 -07:00
Scott Main
3fc184cf6e am 01e48e7d: am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev
* commit '01e48e7d1541920ece358257e4c2481936497835':
  add docs for new attributes, including account restriction for restricted profiles
2013-04-25 21:27:06 -07:00
Scott Main
b40c1fdaee add docs for new attributes, including account restriction for restricted profiles
Change-Id: I737ea55bfa58562b1b384e52626e95b479759376
2013-04-25 19:05:55 -07:00
Romain Guy
1b7c791adf Revert "Skip 2nd measure pass whenever possible"
This reverts commit e8fb03c058.
2013-04-25 14:55:28 -07:00
Romain Guy
e8fb03c058 Skip 2nd measure pass whenever possible
If the height measured during the horizontal pass fits within the
constraints of the vertical pass we can skip the second call to
child.measure().

Change-Id: I3aebf78967e5920ffb28bbe8985ca7a426327a82
2013-04-25 11:49:26 -07:00
Svetoslav
fb2563103b am 939ff0ac: am 4c783066: Merge "Fixing bugs exposed when moving accessibility CTS tests to UiAutomation." into jb-mr2-dev
* commit '939ff0acff8a21a023d79214130680a66214840f':
  Fixing bugs exposed when moving accessibility CTS tests to UiAutomation.
2013-04-23 18:08:55 -07:00
Svetoslav
4c78306617 Merge "Fixing bugs exposed when moving accessibility CTS tests to UiAutomation." into jb-mr2-dev 2013-04-24 01:05:38 +00:00
Svetoslav
db7da0eb8b Fixing bugs exposed when moving accessibility CTS tests to UiAutomation.
1. UiAutomation#executeAndWaitForEvent method was invoking the passed
   runnable while holding the lock which may lead to a deadlock. For
   example: a runnable that calls getActivity() gets us into a state
   like this.

2. UI automation services did not get all capabilities such a
   service can have. Now a UI test service gets all of them.

3. When UiAutomation was exiting for event fired as a result of a
   performed action, it was checking whether the received evnet time
   is strictly before the time of executing the command that should
   fire the event. However, if the execution is fast enough, i.e.
   less than one millisecond, then the event time and the execution
   time are the same. This was leading to a missed signal in rare
   cases.

4. AccessibilityNodeInfoCache was not clearing the relevant state
   for accessibility focus clearing event.

5. Accessibility text traversal in TextView was partially using text
   and partially content description - broken. Now we are using the
   text since for text view and content desc for other views. In other
   words, we are using the most precise text we have.

6. AccessibilityManagerService was not granting capabilities of a
   UiAutomation service - plainly wrong.

CTS change:https://googleplex-android-review.googlesource.com/#/c/300693/

bug:8695422
bug:8657560

Change-Id: I9afc5c3c69eb51f1c01930959232f44681b15e86
2013-04-23 17:44:00 -07:00
Philip Milne
876e4978c0 am 6edbfb9c: am a6d5109d: Merge "Fix for bug 8578258." into jb-mr2-dev
* commit '6edbfb9cdc4d3a83d424565371e78dcdb9a0bb30':
  Fix for bug 8578258.
2013-04-23 16:15:57 -07:00
Philip Milne
3c647d23e5 Fix for bug 8578258.
The fix in:

https://googleplex-android-review.googlesource.com/#/c/300346/

worked but the constant used had an extra trailing zero - which was confusing
and put a 1 in the 'flag' space of the measurement spec.

The intended number was:

0x00800000

Unfortunately, this intended constant doesn't fix this bug.

The constant submitted in this fix is:

0x00010000

which is outside the 'flag' space of measurement specs and appears to steer clear of overflow
problems in the scenario of this bug.

As suggested in the submission above, it would be preferable to rework of the RTL code to avoid
the use of such a constant as it seems very unlikely indeed that any choice of integer can
avoid problems in all cases.

Change-Id: I0c6744257ef2aebe8dbc8c041a447f9b90ee4b84
2013-04-23 15:28:18 -07:00
Philip Milne
e11d9ed3ec am 089a75be: am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
* commit '089a75be5e33e13071754a727902224b6db60168':
  Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
2013-04-23 04:46:31 -07:00
Philip Milne
a7b2625d43 Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev 2013-04-22 22:26:21 +00:00
Philip Milne
ca2e9e1122 Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
GridLayout is working as intended here. The bug is appears to be in RelativeLayout
(and possibly LinearLayout).

The value of RelativeLayout.DEFAULT_WIDTH = Integer.MAX_VALUE/2 is 0x3FFFFFFF has bits
set in the range that is used to flag certain conditions and states by the layout system.

In View we have:

MEASURED_SIZE_MASK = 0x00ffffff
MEASURED_STATE_MASK = 0xff000000;
MEASURED_STATE_TOO_SMALL = 0x01000000

This change fixes this bug, though it looks as if that a safer solution would be to not introduce
this constant and code path in the first place - as RelativeLayout's measurement algorithm operates
in the LTR case without it.

Change-Id: I01c51ae854620f08dd63047594486a3464c86f3a
2013-04-22 12:58:55 -07:00
Chet Haase
684634144b am 371d4ccc: am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
* commit '371d4cccde56ec4d26e51f8e82ef68f196169a3d':
  Fix quickReject logic to account for setClipChildren() setting
2013-04-20 21:37:23 -07:00
Chet Haase
339ac85483 Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev 2013-04-20 21:02:21 +00:00
Chet Haase
dd671599be Fix quickReject logic to account for setClipChildren() setting
The rendering code optimizes by rejecting drawing operations that
lie outside of the bounds of their views. This works in most
situations, but breaks down when containers have called
setClipChildren(false), because we reject drawing that is outside
of that container, but which should be drawn anyway.

Fix is to pass in the value of that flag to the DisplayList drawing
routines which take that flag into account when deciding whether
to quickReject any particular operation.

Issue #8659277 animation clipping

Change-Id: Ief568e4db01b533a97b3c5ea5ad777c03c0eea71
2013-04-19 15:36:37 -07:00
Philip Milne
1027ea4743 am 696b15e5: am 68711f93: Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev
* commit '696b15e52659abdf8852dc60f09fe79edba435e0':
  Revert "Simple MVC based binding mechanism for android controls."
2013-04-19 10:59:43 -07:00
Philip Milne
68711f9363 Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev 2013-04-19 17:53:24 +00:00
Philip Milne
ab104ba6d4 Revert "Simple MVC based binding mechanism for android controls."
Fix for bug 8656899 API REVIEW:
	android.util.PropertyValueModel/ValueModel,
	android.widget.ValueEditor etc

Revert the change that added this API to remove it outright.

This reverts commit 989709a973

Change-Id: I9018cd8dadb1b1a54ad8749c816bd02bb7e7a38b
2013-04-18 21:09:00 -07:00
Svetoslav Ganov
aff9c7652e am 8a28c2c2: am d1f765c0: Merge "Fix restoration of virtual accessibility focus in ListView." into jb-mr2-dev
* commit '8a28c2c2a02c389f3702af9678fa419f2d3c86d7':
  Fix restoration of virtual accessibility focus in ListView.
2013-04-18 19:22:30 -07:00
Svetoslav Ganov
d1f765c009 Merge "Fix restoration of virtual accessibility focus in ListView." into jb-mr2-dev 2013-04-19 02:17:02 +00:00
Craig Mautner
61cc1b632a Merge "Steady improvement to multi stack." 2013-04-17 22:35:02 +00:00
Adam Cohen
c283277551 am f4865efe: am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev
* commit 'f4865efe603e795bc037f5df468556140165eea2':
  DO NOT MERGE Stripping some new widget API that is yet unused
2013-04-17 14:23:01 -07:00
Adam Cohen
be8bc8392e Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 2013-04-17 21:03:43 +00:00
Craig Mautner
29219d963d Steady improvement to multi stack.
- Fix back button behavior with two stacks. Stopping activities were
held in that state indefinitely. This change causes IDLE_NOW_MSG to
be sent immediately for the last activity in a stack.

- Touch in non-focused stack was being ignored because of focus tests
in AbsListView.

- Change the focused stack when the activity focus changes. Renamed
mMainStack to mFocusedStack to reflect this.

- Resume all top stack activities when resuming.

- Assign intent task to ActivityRecord if it doesn't have a task.
Fixes bug 8433463.

Change-Id: I8d3c806234511697bc209ab99890730ffa514d20
2013-04-17 13:54:48 -07:00
Adam Cohen
33f3aab220 DO NOT MERGE Stripping some new widget API that is yet unused
Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
2013-04-17 13:48:45 -07:00