Adam Powell
51d6615af4
am 8dcc0e7d: am 7ef9b612: Merge "Fix monkey bugs in ListView" into klp-dev
...
* commit '8dcc0e7dfb05a50ca306942037015244060862b8':
Fix monkey bugs in ListView
2013-09-24 15:44:01 -07:00
Adam Powell
4900f13ee4
am 7be7d86c: am 5ded30c9: Merge "Asset import from ux-assets" into klp-dev
...
* commit '7be7d86ce9d15ab94ace2e69fc192c226ad18a3b':
Asset import from ux-assets
2013-09-24 15:43:58 -07:00
Adam Powell
8dcc0e7dfb
am 7ef9b612: Merge "Fix monkey bugs in ListView" into klp-dev
...
* commit '7ef9b612412a2169c8c0e0b3506b06516cb012b5':
Fix monkey bugs in ListView
2013-09-24 15:40:44 -07:00
Adam Powell
7be7d86ce9
am 5ded30c9: Merge "Asset import from ux-assets" into klp-dev
...
* commit '5ded30c9b780c584c9d1984cc019f7d1d0b38fe5':
Asset import from ux-assets
2013-09-24 15:40:41 -07:00
Adam Powell
7ef9b61241
Merge "Fix monkey bugs in ListView" into klp-dev
2013-09-24 22:38:37 +00:00
Adam Powell
5ded30c9b7
Merge "Asset import from ux-assets" into klp-dev
2013-09-24 22:38:22 +00:00
Adam Powell
31986b5b69
Fix monkey bugs in ListView
...
* Don't run item click listeners as part of touch mode reset if the
ListView is being detached from its window. Some calling code makes
assumptions around this.
* Remove redundant state tracking for window attachment from
AbsListView now that we have View#isAttachedToWindow(). The timing
of View's mechanism is closer to what we want here anyway -
subclasses calling super.onDetachedFromWindow() as the first line of
an overridden onDetachedFromWindow() method will see the window as
being in a detached state while the rest of the method runs,
resulting in the behavior described in the first bullet point above.
Bug 10834897
Change-Id: Ic9fdff3c5cfc4996361a7fb1a863547b4d1a2c9c
2013-09-24 15:20:07 -07:00
Adam Powell
2878b06d4a
Asset import from ux-assets
...
Import changed assets as detailed in bug 10496653
Change-Id: I53fd9479031e7eabb6480c58a26da6312fdb7ec7
2013-09-24 15:10:25 -07:00
Dianne Hackborn
23ff9f6128
am 9b7d1484: am 5f86b90b: Merge "Fix issue #10848916 : "Always" button is not working." into klp-dev
...
* commit '9b7d148466b1aedb24187294e0c59718afb104a0':
Fix issue #10848916 : "Always" button is not working.
2013-09-24 14:51:06 -07:00
Dianne Hackborn
9b7d148466
am 5f86b90b: Merge "Fix issue #10848916 : "Always" button is not working." into klp-dev
...
* commit '5f86b90b8a224e21db89bacf78d4bd4d3f44342d':
Fix issue #10848916 : "Always" button is not working.
2013-09-24 14:49:17 -07:00
Dianne Hackborn
5f86b90b8a
Merge "Fix issue #10848916 : "Always" button is not working." into klp-dev
2013-09-24 21:46:17 +00:00
Alan Viverette
e3b71bc910
am 4e10483d: am 6bc7cacf: Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev
...
* commit '4e10483de3a28041e1108633752581cb0fc77483':
Fix NPE in PopupMenu.getDragToOpenListener()
2013-09-24 14:38:51 -07:00
Alan Viverette
4e10483de3
am 6bc7cacf: Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev
...
* commit '6bc7cacfc8c34512278460028b7f6f0a4be220b4':
Fix NPE in PopupMenu.getDragToOpenListener()
2013-09-24 14:33:50 -07:00
Alan Viverette
6bc7cacfc8
Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev
2013-09-24 21:28:56 +00:00
John Spurlock
caf2afc1fd
am 8d87227c: am 0ab7d4d1: Merge "Remove Rect allocation in each layout pass." into klp-dev
...
* commit '8d87227c02f31ee63f80b20b0fd6bb8212d34997':
Remove Rect allocation in each layout pass.
2013-09-24 14:21:12 -07:00
John Spurlock
8d87227c02
am 0ab7d4d1: Merge "Remove Rect allocation in each layout pass." into klp-dev
...
* commit '0ab7d4d1a114b888889862ec7a5e2dc3bcd23fa5':
Remove Rect allocation in each layout pass.
2013-09-24 14:19:19 -07:00
John Spurlock
0ab7d4d1a1
Merge "Remove Rect allocation in each layout pass." into klp-dev
2013-09-24 21:18:00 +00:00
Dianne Hackborn
6d8dfbd814
Fix issue #10848916 : "Always" button is not working.
...
The problem was that the ResolverActivity filters some activities
out of the list it shows, but it uses that display list as the
list of components the preference is set against when ultimately
setting it on the package manager... but that filtered list is *not*
the right component set, since it is not the same as the package
manager's view on it.
The fix here is to retain the original set of matching components
and use that when setting the preferred activity. Note that this
does mean that in very unusual cases where filtering is happeing
(such as one of the activities not being exported but being seen
as a possible completion from another app), then you will be setting
the preference for the complete set. Ultimately we probably need
to have the package manager apply these filtering rules up-front so
this is all consistent, but this is a very rare case so not that
important.
And then most of the change here is just improving the debug
output for intent resolution.
Change-Id: Ie35ac2c05a45946439951bbf41433c8b7de79c05
2013-09-24 14:16:38 -07:00
John Spurlock
4e92a7cf03
Remove Rect allocation in each layout pass.
...
Bug:10786445
Change-Id: I0cb1ab7697f33e02adeb5319bae19d3a1d20753c
2013-09-24 17:09:05 -04:00
Chet Haase
e4039cc6bc
am 5c69fd7d: am cfdc0369: Merge "Disable ActionBar usage of transitions" into klp-dev
...
* commit '5c69fd7d36af2d186fa3b654cf8b3e6eeb5596b9':
Disable ActionBar usage of transitions
2013-09-24 14:04:01 -07:00
Chet Haase
5c69fd7d36
am cfdc0369: Merge "Disable ActionBar usage of transitions" into klp-dev
...
* commit 'cfdc0369f133787ed60015610016e9e53964bd77':
Disable ActionBar usage of transitions
2013-09-24 14:01:48 -07:00
Chet Haase
cfdc0369f1
Merge "Disable ActionBar usage of transitions" into klp-dev
2013-09-24 20:58:40 +00:00
Svetoslav
8e137b53b9
am d454beb8: am 0d38d0b4: Merge "Multiple printer discovery session instances and other bugs." into klp-dev
...
* commit 'd454beb8545e9427eaeb5eb757badbe6907cf6a2':
Multiple printer discovery session instances and other bugs.
2013-09-24 13:41:47 -07:00
Svetoslav
d454beb854
am 0d38d0b4: Merge "Multiple printer discovery session instances and other bugs." into klp-dev
...
* commit '0d38d0b42fba7dc50454d5c0652cf351c58a9db6':
Multiple printer discovery session instances and other bugs.
2013-09-24 13:40:02 -07:00
Jeff Sharkey
80e9c3e5bf
am 173ef6aa: am 08df7d91: Merge "Freshen restored stacks, more UX bug fixes." into klp-dev
...
* commit '173ef6aa241bc67a13144da96067cbc34cf7e512':
Freshen restored stacks, more UX bug fixes.
2013-09-24 13:38:18 -07:00
Svetoslav
0d38d0b42f
Merge "Multiple printer discovery session instances and other bugs." into klp-dev
2013-09-24 20:37:59 +00:00
Jeff Sharkey
173ef6aa24
am 08df7d91: Merge "Freshen restored stacks, more UX bug fixes." into klp-dev
...
* commit '08df7d9137bd90c57623bc9cc9db3629e3a945eb':
Freshen restored stacks, more UX bug fixes.
2013-09-24 13:36:34 -07:00
Jeff Sharkey
08df7d9137
Merge "Freshen restored stacks, more UX bug fixes." into klp-dev
2013-09-24 20:34:40 +00:00
Jeff Sharkey
deffadeb74
Freshen restored stacks, more UX bug fixes.
...
When restoring a persisted stack, such as last location or a location
where save occurred, freshen the DocumentStack to get the latest
details from backend, and ensure the path is still valid.
Filter Recent directories in create mode based on roots allowed by
incoming request.
Remember when user last picked an external app, and open drawer next
time user launches for GET_CONTENT.
Fix state list drawable ordering, and avoid clobbering Drawable
callback when wrapping in InsetDrawable; tricksy hobbitses!
Make grid items smaller to always fit two columns on phones. Draw
grid items all the way to screen edge; don't clip to padding. Better
error message when folder creation failed. Show Recents in grid mode
when picking any visual content, not just images.
Bug: 10846100, 10903211, 10898993, 10892808, 10892058, 10892009, 10885012
Change-Id: Ia0f88d911abc6ea03645d6fd3e04271c21d5936a
2013-09-24 12:57:47 -07:00
Craig Mautner
469b6bed17
am 4099dc89: am 9bf6c5ce: Merge "Fix method for determining focused window." into klp-dev
...
* commit '4099dc89817ac5d87dfbac12f66c79918df520f9':
Fix method for determining focused window.
2013-09-24 12:38:29 -07:00
Craig Mautner
4099dc8981
am 9bf6c5ce: Merge "Fix method for determining focused window." into klp-dev
...
* commit '9bf6c5cec834343104aa326b65b86c064c86c6cb':
Fix method for determining focused window.
2013-09-24 12:35:25 -07:00
Craig Mautner
9bf6c5cec8
Merge "Fix method for determining focused window." into klp-dev
2013-09-24 19:33:17 +00:00
Lajos Molnar
9ae69e73af
am 6ce2967f: am 566d6b65: Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev
...
* commit '6ce2967fa4e9c2a8f8dab741c58c622bacb34a4c':
WebVttRenderer: allow BOM at beginning of a WebVTT file.
2013-09-24 11:41:52 -07:00
Lajos Molnar
6ce2967fa4
am 566d6b65: Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev
...
* commit '566d6b653466a4aed3a47b13ec03171912c48287':
WebVttRenderer: allow BOM at beginning of a WebVTT file.
2013-09-24 11:39:41 -07:00
Alan Viverette
5fbd62b399
am 36055c33: am e1cb9acc: Merge "Update AdapterView.performItemClick() documentation" into klp-dev
...
* commit '36055c3396051e1f1e0257b9e98c0b9b5ac16080':
Update AdapterView.performItemClick() documentation
2013-09-24 11:38:18 -07:00
Lajos Molnar
566d6b6534
Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev
2013-09-24 18:37:12 +00:00
Alan Viverette
36055c3396
am e1cb9acc: Merge "Update AdapterView.performItemClick() documentation" into klp-dev
...
* commit 'e1cb9accf2077833c96e748150d0aee8e05cb10a':
Update AdapterView.performItemClick() documentation
2013-09-24 11:32:41 -07:00
Alan Viverette
e1cb9accf2
Merge "Update AdapterView.performItemClick() documentation" into klp-dev
2013-09-24 18:28:01 +00:00
Alan Viverette
99d72497d3
Fix NPE in PopupMenu.getDragToOpenListener()
...
BUG: 10912382
Change-Id: I206e697b4781c4d03ebc01aa675511d89c1656af
2013-09-24 11:27:08 -07:00
Craig Mautner
15a0436ac4
am a52bfb9f: am 254f5ffc: Merge "Pause activities behind keyguard after boot." into klp-dev
...
* commit 'a52bfb9fe4d8f28ccb6bc3eda37250f0d3aeb8d4':
Pause activities behind keyguard after boot.
2013-09-24 10:46:56 -07:00
Craig Mautner
a52bfb9fe4
am 254f5ffc: Merge "Pause activities behind keyguard after boot." into klp-dev
...
* commit '254f5ffc47fe26d48fe3fd9f3bc513805dd04ac5':
Pause activities behind keyguard after boot.
2013-09-24 10:43:53 -07:00
Craig Mautner
254f5ffc47
Merge "Pause activities behind keyguard after boot." into klp-dev
2013-09-24 17:39:17 +00:00
Craig Mautner
2acc389d61
Pause activities behind keyguard after boot.
...
Following boot the initial activity was automatically resumed even if
a lockscreen is obscuring it. Refer to CL 363859 for why this breaks
things.
This fix pauses all activities the first time a lockscreen appears.
Completes the fix for bug 10732489.
Change-Id: I6fcac14b574c495aa0e16d798cddc1263c6b4c25
2013-09-24 10:36:05 -07:00
Jean-Michel Trivi
62719220a1
am e783ffab: am bc05918c: Merge "Public API for peak and RMS monitoring through the Visualizer effect" into klp-dev
...
* commit 'e783ffab89dbe612a4865a1a1e1a7814522b0ef4':
Public API for peak and RMS monitoring through the Visualizer effect
2013-09-24 10:26:46 -07:00
Baligh Uddin
0750a14ae5
am 4452a3f5: (-s ours) am 89104790: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '4452a3f591466b32fdaefc7e2138020a77a1aadd':
Import translations. DO NOT MERGE
2013-09-24 10:26:40 -07:00
Baligh Uddin
46cf5f0161
am 132f50cd: (-s ours) am 71a5f3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '132f50cddf0dcd3ab207890959c6e003a70e4766':
Import translations. DO NOT MERGE
2013-09-24 10:26:36 -07:00
Baligh Uddin
db409ac0f5
am 0c47508c: (-s ours) am 87ac87a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '0c47508cf3c495124287db057f412f52c92263b6':
Import translations. DO NOT MERGE
2013-09-24 10:26:33 -07:00
Martin Kosiba
8ed79f45d6
am dc7053be: am 4e31b804: Merge "Update WebView documentation section about zoom." into klp-dev
...
* commit 'dc7053be9ff1b89464063ed6a338fd29580b5abf':
Update WebView documentation section about zoom.
2013-09-24 10:26:10 -07:00
Zhijun He
1562ca8bf5
am ff704b63: am 0d9fdc24: Merge "Camera2: replace EDQUOT with EUSERS" into klp-dev
...
* commit 'ff704b63dda946531b7e3774b2ac4211f63349c3':
Camera2: replace EDQUOT with EUSERS
2013-09-24 10:25:56 -07:00
Jim Miller
53fba32945
am c8f00291: am 89e1fec9: Merge "Fit and finish for navbar camera affordance" into klp-dev
...
* commit 'c8f00291f670cb3741347c82b615a110f5729c6f':
Fit and finish for navbar camera affordance
2013-09-24 10:23:15 -07:00