Elliott Hughes
a4fbd6ddca
am e713f57a: am d82b1c3b: am 9d8721f8: Merge "Remove dead code."
...
* commit 'e713f57a6ebbeb6571226422c42c2c3d6c113a9a':
Remove dead code.
2013-09-24 17:56:15 -07:00
Elliott Hughes
e713f57a6e
am d82b1c3b: am 9d8721f8: Merge "Remove dead code."
...
* commit 'd82b1c3bf2abbc1582c90362267650cf05d38cd5':
Remove dead code.
2013-09-24 17:54:42 -07:00
Elliott Hughes
d82b1c3bf2
am 9d8721f8: Merge "Remove dead code."
...
* commit '9d8721f8abb018429e3dba2296bce789b776aa0c':
Remove dead code.
2013-09-24 17:51:58 -07:00
Elliott Hughes
9d8721f8ab
Merge "Remove dead code."
2013-09-25 00:47:54 +00:00
Craig Mautner
e4a0bf8dba
am f77c1eb1: am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev
...
* commit 'f77c1eb1e0160364bb23972238952ee4f7b08c29':
Be less aggressive when not resuming top activity
2013-09-24 17:36:56 -07:00
Craig Mautner
f77c1eb1e0
am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev
...
* commit '8488f9fa2e38e75e7ecbaac7d776900f8f1e5917':
Be less aggressive when not resuming top activity
2013-09-24 17:31:57 -07:00
Jason Sams
f684b81580
Merge "Remove hidden API setSurfaceTexture."
2013-09-25 00:29:32 +00:00
Craig Mautner
8488f9fa2e
Merge "Be less aggressive when not resuming top activity" into klp-dev
2013-09-25 00:28:20 +00:00
Elliott Hughes
4b395a3625
Remove dead code.
...
This hasn't been used since at least 2011, and we're no longer
shipping the data supporting it either.
Change-Id: Ibe42057650b49794c65d6f0d54ed7a492f3b594b
2013-09-24 17:22:11 -07:00
Jean-Michel Trivi
8a7ae6708d
am 6dda4984: am 80e8a28c: Merge "Fix artwork not received in RemoteController metadata update." into klp-dev
...
* commit '6dda4984cf636c2804ee6c6b109bcbb69d4baa04':
Fix artwork not received in RemoteController metadata update.
2013-09-24 16:42:49 -07:00
Jean-Michel Trivi
6dda4984cf
am 80e8a28c: Merge "Fix artwork not received in RemoteController metadata update." into klp-dev
...
* commit '80e8a28c339e88b59b681eff20d5438526d6b699':
Fix artwork not received in RemoteController metadata update.
2013-09-24 16:40:03 -07:00
Jean-Michel Trivi
80e8a28c33
Merge "Fix artwork not received in RemoteController metadata update." into klp-dev
2013-09-24 23:37:22 +00:00
Craig Mautner
6ff6d010d1
Be less aggressive when not resuming top activity
...
The previous fix for keeping activities from running on startup,
ag/363992, was keeping the home task from launching when the
keyguard should have allowed it.
This fix permits the home activity to launch in such situations.
Fixes bug 10916877.
Change-Id: I429f0d5a13e06a247b9b6b7241f9a3514044c371
2013-09-24 16:21:54 -07:00
Svetoslav
62034df44d
am de31fbe0: am b55afe8b: Merge "User should not be able to select unavailable printers." into klp-dev
...
* commit 'de31fbe04a75d9a8c3c163fbebeacd052ce54e72':
User should not be able to select unavailable printers.
2013-09-24 16:21:31 -07:00
Svetoslav
de31fbe04a
am b55afe8b: Merge "User should not be able to select unavailable printers." into klp-dev
...
* commit 'b55afe8b835da2d0ebe596877bf93076e4726724':
User should not be able to select unavailable printers.
2013-09-24 16:17:43 -07:00
Svetoslav
b55afe8b83
Merge "User should not be able to select unavailable printers." into klp-dev
2013-09-24 23:15:58 +00:00
Rob Tsuk
ab80dc43c9
am f86598e6: am 198a7b5c: Merge "Replace blue highlight feedback with gray." into klp-dev
...
* commit 'f86598e6eca5375e0312b5ec72e8da0e8fcca094':
Replace blue highlight feedback with gray.
2013-09-24 15:50:59 -07:00
Rob Tsuk
f86598e6ec
am 198a7b5c: Merge "Replace blue highlight feedback with gray." into klp-dev
...
* commit '198a7b5cb1ddb4c4e7c24537a7d3451913f7dd4c':
Replace blue highlight feedback with gray.
2013-09-24 15:47:35 -07:00
Svetoslav
2a708617df
User should not be able to select unavailable printers.
...
1. If the printer is unavailable we should not allow the user
to select it. Rather, show it grayed out.
2. Some string changes requeted by translators.
bug:10917222
Change-Id: I370f05f9c8e70e3f077db7eb02cf48e19a59925d
2013-09-24 15:46:17 -07:00
Rob Tsuk
198a7b5cb1
Merge "Replace blue highlight feedback with gray." into klp-dev
2013-09-24 22:44:38 +00:00
Michael Wright
7235ae06a1
am f8ea6dd6: am 870cb435: Merge "Mirror DocumentsUI assets for RTL layouts" into klp-dev
...
* commit 'f8ea6dd6cb974499b66a8cf1262e34ff0e789e15':
Mirror DocumentsUI assets for RTL layouts
2013-09-24 15:44:04 -07:00
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
Michael Wright
f8ea6dd6cb
am 870cb435: Merge "Mirror DocumentsUI assets for RTL layouts" into klp-dev
...
* commit '870cb43585b2432622c807e762dd7992de4eb0f1':
Mirror DocumentsUI assets for RTL layouts
2013-09-24 15:40:47 -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
Michael Wright
870cb43585
Merge "Mirror DocumentsUI assets for RTL layouts" into klp-dev
2013-09-24 22:39:07 +00: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
Jason Sams
3a1b8e4116
Remove hidden API setSurfaceTexture.
...
Change-Id: Ib6a3c5b84550932168f314375e74059507fc01ae
2013-09-24 15:18:52 -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
Rob Tsuk
dbef227670
Replace blue highlight feedback with gray.
...
Change-Id: Idf95742261cdc19b25b0aa5e1e8c8cb9685e7fe5
2013-09-24 14:33:12 -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