5249 Commits

Author SHA1 Message Date
Svetoslav
a03cf04b8d am 25f17f29: Merge "Not change the print options on printer change if possible." into klp-dev
* commit '25f17f295b4da464a2758c11a02cabb51bf4722f':
  Not change the print options on printer change if possible.
2013-09-12 15:40:28 -07:00
Svetoslav
cc65b0c325 Not change the print options on printer change if possible.
If the user selects some print options from the dialog and then
changes the printer to one that has the same capabilities the
selections in the UI should not change.

bug:10631856

Change-Id: Ia76ce58c446815e3498d2f4b4739dee62d11d96a
2013-09-12 14:29:53 -07:00
Svetoslav
410fc39444 am ef2088a2: Merge "Handle print serivce crashes." into klp-dev
* commit 'ef2088a26a42621329c6b9fecb323566e19490e4':
  Handle print serivce crashes.
2013-09-12 13:27:47 -07:00
Svetoslav
ef2088a26a Merge "Handle print serivce crashes." into klp-dev 2013-09-12 20:24:40 +00:00
Vinit Deshapnde
2f2184b755 am 074dc2eb: Merge "Don\'t restore EAP-TLS networks from backup" into klp-dev
* commit '074dc2eb2da23976bc2916cfe7c61dfcd9977e8f':
  Don't restore EAP-TLS networks from backup
2013-09-12 10:56:15 -07:00
Vinit Deshapnde
074dc2eb2d Merge "Don't restore EAP-TLS networks from backup" into klp-dev 2013-09-12 17:53:39 +00:00
Svetoslav
c6066799ad Handle print serivce crashes.
1. Now after a print service crashes we are bringing it to the same
    state of its lifecycle. For example, if a service does a discovery
    and crashes we recreate the discovery session call the start
    discovery method and so on.

2. Turned off debugging logs since we have fully fledged state dump.

bug:10697779

Change-Id: Id790537461428e96b197eef12258996bda2bd1ce
2013-09-12 10:52:26 -07:00
John Spurlock
932c1251e4 am 43c70b0c: Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev
* commit '43c70b0ccface3e7e0730d9bc0a46b90f16c4b17':
  Status bar interaction veto revoked on ups/cancels.
2013-09-12 09:17:05 -07:00
Jeff Sharkey
c3414dc4ba am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev
* commit '357f9e34ca4f0336e406044db35834530379db47':
  Handle pipe thumbnails, acquire unstable refs.
2013-09-12 09:17:02 -07:00
John Spurlock
43c70b0ccf Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 2013-09-12 16:05:56 +00:00
Jeff Sharkey
357f9e34ca Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 2013-09-12 16:00:40 +00:00
John Spurlock
5fee8360f8 Status bar interaction veto revoked on ups/cancels.
If we get an ACTION_UP or ACTION_CANCEL and the shade is not
expanded, treat this as a signal of !interacting, revoking
the interaction veto.

Bug:10711758
Change-Id: Ia69ff24880193fa8d99ece79053eeb95dfa9ba71
2013-09-12 11:35:08 -04:00
Baligh Uddin
4dff98689d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:46:12 +00:00
Baligh Uddin
c57bd8b996 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:52 +00:00
Jeff Sharkey
de2b22fbc6 Handle pipe thumbnails, acquire unstable refs.
Support decoding thumbnails delivered over pipes by wrapping in a
buffered stream.  Also switch to using unstable provider references
to avoid crashing DocumentsUI.

Bug: 10516148, 10510851
Change-Id: I85f6eeaca70c97742bf79656d1d0c6da381fdd47
2013-09-11 17:33:52 -07:00
Jeff Sharkey
e2d76fa8c6 am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev
* commit 'ceccceccffbd2668b98e21487f2323f80d2c7b98':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
2013-09-11 13:19:12 -07:00
Jeff Sharkey
ceccceccff Merge changes Ib1274847,I2eb2a1bf into klp-dev
* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
2013-09-11 20:16:59 +00:00
Sandeep Siddhartha
6c5e9fb4c4 am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev
* commit 'f702286c94f0df9fc147135c19f12ef34e8594c9':
  Remove HotwordRecognition APIs
2013-09-11 12:06:29 -07:00
Sandeep Siddhartha
f702286c94 Merge "Remove HotwordRecognition APIs" into klp-dev 2013-09-11 19:01:51 +00:00
Baligh Uddin
243a2c4293 Import translations. DO NOT MERGE
Change-Id: I92fdf6e34e65d70e813b5f3f5139659fb0eab2ce
Auto-generated-cl: translation import
2013-09-11 11:46:30 -07:00
Amith Yamasani
dd9157ce31 am b926d484: Merge "Handle the case where the restore environment doesn\'t have the ringtone" into klp-dev
* commit 'b926d484a76eda4152ba46d3ef517517226ca699':
  Handle the case where the restore environment doesn't have the ringtone
2013-09-11 11:30:08 -07:00
Baligh Uddin
caaf6979f3 Import translations. DO NOT MERGE
Change-Id: I00a9521d0ac1e2463268295d1ea09f2894b1618c
Auto-generated-cl: translation import
2013-09-11 11:15:47 -07:00
Amith Yamasani
2e804444d6 Handle the case where the restore environment doesn't have the ringtone
Bug: 10130785

uncanonicalize() can return a null now, so abort restoring the ringtone
in that case.

Change-Id: I28765818c8d3e1fb3f271afdfe66ebc955cfcefe
2013-09-11 11:11:19 -07:00
Sandeep Siddhartha
65a6ba3478 Remove HotwordRecognition APIs
- and its usage from Keyguard

Bug: 10708010
Change-Id: Ic4a695a1d0e9312706a3b4ff01e59e2567b6ad9c
2013-09-11 11:01:13 -07:00
Jeff Sharkey
aca405cd59 Fix SDK build.
Change-Id: Ib12748478cb1b42621454ab2035fb8f3163b6ac8
2013-09-11 09:14:16 -07:00
John Spurlock
7bb21556e7 am ec7a6ea8: Merge "Add activity indicator icons to quick settings tiles." into klp-dev
* commit 'ec7a6ea84578be91e04a54331ea4ca63e7fb69e1':
  Add activity indicator icons to quick settings tiles.
2013-09-11 07:51:25 -07:00
John Spurlock
ec7a6ea845 Merge "Add activity indicator icons to quick settings tiles." into klp-dev 2013-09-11 14:50:08 +00:00
John Spurlock
43670879fa Add activity indicator icons to quick settings tiles.
Wifi + RSSI now have activity in / activity out indicators
wired up to information coming from NetworkController.

Bug: 10634208
Change-Id: I3cf29dc905eeaeb4aea8e7df4fe46e70645e0013
2013-09-11 10:04:44 -04:00
Daniel Sandler
d6360a28af am ab6284f1: Merge "New orange color for status bar + qs assets." into klp-dev
* commit 'ab6284f1e0224fcbf07de5bd0c1e9ed58509946a':
  New orange color for status bar + qs assets.
2013-09-11 06:53:36 -07:00
John Spurlock
79897c0db0 am 79ec2a15: Don\'t rely on window state when disabling the panel.
* commit '79ec2a15f791ca583c97fa8de772347f93cec568':
  Don't rely on window state when disabling the panel.
2013-09-11 06:53:32 -07:00
Daniel Sandler
ab6284f1e0 Merge "New orange color for status bar + qs assets." into klp-dev 2013-09-11 13:51:19 +00:00
John Spurlock
79ec2a15f7 Don't rely on window state when disabling the panel.
Bug:10488453
Change-Id: I09ffbf166dd34489064cf0d73fe7ae4dd356c6c9
2013-09-11 09:28:49 -04:00
John Spurlock
8a6c77545b New orange color for status bar + qs assets.
Bug:10502089
Change-Id: I7b43fe260ceccba29f896009ce467fe29ec67f64
2013-09-11 08:37:43 -04:00
Jeff Sharkey
a339f2e5bb am 1434a407: Merge "More tweaks to match UX spec." into klp-dev
* commit '1434a4075d4582d932023b1720b2a1213e6ea282':
  More tweaks to match UX spec.
2013-09-10 21:20:46 -07:00
Jeff Sharkey
1434a4075d Merge "More tweaks to match UX spec." into klp-dev 2013-09-11 04:18:13 +00:00
Jeff Sharkey
ed903213e6 More tweaks to match UX spec.
Fixed text colors to match spec.  Behold The Greyening!  Centered
loader spinner in grid mode.  Show multiple lines in status messages.

Add string descriptions.  Fix bug where toggling size setting didn't
kick a UI rebind.

Bug: 10510022
Change-Id: Icb41ebeb4de0fed8c04fc6cf5213af1587b72641
2013-09-10 20:04:11 -07:00
Amith Yamasani
485d9afe60 am a0a47c73: Merge "Backup and restore ringtone and notification ringtone" into klp-dev
* commit 'a0a47c737951db52af4943f5737da48d30adc6fe':
  Backup and restore ringtone and notification ringtone
2013-09-10 17:05:45 -07:00
Amith Yamasani
a0a47c7379 Merge "Backup and restore ringtone and notification ringtone" into klp-dev 2013-09-11 00:03:50 +00:00
Jeff Sharkey
bd56a17df2 am af4d039f: Merge "More UX work for thumbnails, search, management." into klp-dev
* commit 'af4d039fb3a45d4a74683a69ee48071b8338a13d':
  More UX work for thumbnails, search, management.
2013-09-10 17:02:11 -07:00
Jeff Sharkey
af4d039fb3 Merge "More UX work for thumbnails, search, management." into klp-dev 2013-09-10 23:59:43 +00:00
Jeff Sharkey
4ec973925f More UX work for thumbnails, search, management.
Hide non-finished downloads from normal picker UI, but keep them
around in management mode.  Uses a Uri query parameter and a hidden
API on DocumentsProvider.

Scale thumbnails to fit viewport, always show MIME icon while waiting
on thumbnails, and crossfade between them.  Cancel thumbnail tasks
when views are recycled.

Filter directories out of search results for now.  Also leave sort
ordering from backend intact, since it's custom ranking.  Fix
SearchView interaction to dismiss properly and restore across
orientation and drawer state changes.

Hide most actions when drawer is open.  Invalidate RootInfo cache
when locale changes.  Apply sort ordering when showing recent create
directories.  Hide recent summary string when icon is enough for user
to disambiguate.

Bug: 10667184, 10665663
Change-Id: I331d3272a08c497f88dc659d9e112231cb35aa69
2013-09-10 16:40:36 -07:00
Jason Monk
b28da84896 am e6b4163f: Merge "Verify inputs to PAC resolving." into klp-dev
* commit 'e6b4163f38c18072ef89ec593d4647c581dd9a8a':
  Verify inputs to PAC resolving.
2013-09-10 13:32:08 -07:00
Jason Monk
e6b4163f38 Merge "Verify inputs to PAC resolving." into klp-dev 2013-09-10 20:27:23 +00:00
Amith Yamasani
622bf2220c Backup and restore ringtone and notification ringtone
Use the new content provider API to canonicalize Uris.
If the provider doesn't support it, don't save the value,
unless it's a silent ringtone.

Bug: 10130785

Change-Id: Id08bb2812b9b2a7036a25801d1997661b0017629
2013-09-10 11:08:24 -07:00
Marco Nelissen
488e925ff9 am 8716c081: Merge "Use correct timescale for "date taken" field" into klp-dev
* commit '8716c08151378f7488a0f129fe43a0b3d4dc499d':
  Use correct timescale for "date taken" field
2013-09-10 09:12:05 -07:00
Marco Nelissen
8716c08151 Merge "Use correct timescale for "date taken" field" into klp-dev 2013-09-10 16:09:16 +00:00
Baligh Uddin
5f5e84770b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-10 05:00:52 +00:00
Jeff Sharkey
78bb372fb7 am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev
* commit 'af9272349fb9eed1653d5af0768c9517e36070a6':
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
2013-09-09 21:42:50 -07:00
Jeff Sharkey
af9272349f Merge changes I7b3f4c68,I9f022a08 into klp-dev
* changes:
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
2013-09-10 04:40:41 +00:00
Jeff Sharkey
b7757a6b32 Rename offer() to add(), remove/hide some APIs.
Change MatrixCursor offer() to add() based on review feedback.  Remove
some now-unused XML metadata.  Hide document creation, since it's not
supported in initial version.

Bug: 10577809, 10461706, 10678563
Change-Id: I7b3f4c6899c28f633471ef816bee22bf032aa0d2
2013-09-09 17:55:10 -07:00