113653 Commits

Author SHA1 Message Date
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
Vinit Deshapnde
6029611e3a Fix an incorrectly created race accessing Wifi Supplicant
ScanModeState is trying to undo whatever it did in its enter(), in its
exit() function. But doing that is incorrect because it is possible to
transition to multiple states that require different conditions.

In this bug, the state machine transitioned from ScanModeState to
WaitForP2pDisabled state; in response to Stop Supplicant command. Well,
when we are trying to stop supplicant, there is clearly no need to
enable P2P or load all networks. But since this code exists in exit(),
it is executed nonetheless, causing race conditions accessing the
wpa_supplicant (WifiStateMachine is trying to shut it down, but
P2pStateMachine is trying to bring up the p2p interfaces).

We solve that problem by moving this code to the place where we transition
to DisconnectedState - since that's the state that needs this as a
precondition.

Bug: 10761752
Change-Id: Iaf0ffd8056de8533b5d2bfdf8c440fbb7e406dac
2013-09-24 17:38:09 -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
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
Christopher Tate
6578ad17ca Don't crash when no alarms are scheduled
Backing until you hear glass is generally contraindicated.

Bug 10056484

Change-Id: Ie1331fbbc5fbb5d6384a6cfc975aa1840a5c9a2d
2013-09-24 17:12:46 -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
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
Jim Miller
e38c8e28ba Fix accessibility for all-caps items in keyguard
This fixes a bug where TTS on all-caps items doesn't work for
Buttons.  The fix is to use translation (ala. TextView.setAllCaps()),
which just affects rendering and not the original text string.

Fix bug 10912259

Change-Id: Id8cba927819c979fe699353219d45f8b0f9f5aac
2013-09-24 15:54:04 -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
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
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
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
Jim Miller
8de9e443d8 Fit and finish for navbar camera affordance
- fix potential event dispatch bug where camera events weren't always propagated
- fix DelegateViewHelper to always propagate events, even when disabled

Bug 10332383

Change-Id: Ie082d3074fc6497ee3633dcc0a51a6b08bcf0037
2013-09-24 14:46:50 -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
Mindy Pereira
98860d4592 De-blue notification backgrounds
Change-Id: I8ffd500a7e25bead8d3a82e3c118f9cacbcd4416
2013-09-24 14:42:55 -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
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
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
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
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
Michael Wright
56d2030a35 Mirror DocumentsUI assets for RTL layouts
Bug: 10641916
Change-Id: I037adeb5ec7df6e3812be8653929a55ed8b87323
2013-09-24 12:50:00 -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
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
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