Commit Graph

844 Commits

Author SHA1 Message Date
Steve McKay
ea9092fdbf Merge "Fix regression, show internal storage option..." into nyc-dev am: 9a76143ef5 am: 20898f682b
am: 5fa1f50f01

* commit '5fa1f50f0179313d32ec59d7949884be6801b17d':
  Fix regression, show internal storage option...

Change-Id: I8f21a54839c594f16c3e4cec58f3de7e0881b852
2016-05-06 15:29:34 +00:00
Steve McKay
5acf1ac2ab Fix regression, show internal storage option...
...for non "Downloads" scenarios like "Copy to".
Bug: 28552420

Change-Id: If317e3f575a40cac69628c1b6eecfc6be1dfcbce
2016-05-05 14:38:55 -07:00
Steve McKay
da0755ee8f Merge "Finish selection mode after copyto and share..." into nyc-dev am: 94e3b80d5b am: 6818cd5540
am: f9cb0774fb

* commit 'f9cb0774fbc3d40d8ec03f0a519f4f646d24d5ed':
  Finish selection mode after copyto and share...

Change-Id: Ic896d181603be626c17edee5f0d6f7abebd918b1
2016-05-04 22:30:46 +00:00
TreeHugger Robot
94e3b80d5b Merge "Finish selection mode after copyto and share..." into nyc-dev 2016-05-04 20:58:39 +00:00
Steve McKay
14380378a7 Merge commit \'1d8b98b\' into fixMerge
am: 01b21d8be8

* commit '01b21d8be8fcd961ae7063e462f265d32c62aee2':
  Disable share when dirs selected.

Change-Id: I8335e71b05f20018c43641eebb21754aa9664ccc
2016-05-04 20:38:42 +00:00
Vladislav Kaznacheev
040d4972d3 resolve merge conflicts of c1790be to master
Change-Id: I4b758ba23cc7ae2363f553395fbb52da615effd1
2016-05-04 11:06:24 -07:00
Vladislav Kaznacheev
c1790befba Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev am: e06ef946f4
am: 36ad144f6d

* commit '36ad144f6d28034edc1dd7e7f387c3ab432ce475':
  Collect mime type data correctly for all URIs added to ClipData

Change-Id: I2ce8d4850d83f6bfb43862ad0638035cbe252f6c
2016-05-04 17:17:21 +00:00
Steve McKay
3fff306827 Merge "Disable share when dirs selected." into nyc-dev 2016-05-04 16:46:30 +00:00
Steve McKay
080efafe1f Finish selection mode after copyto and share...
actions are picked by user.
Bug: 27601508

Change-Id: I32cbc8e8eb4abba4161309327d5ce730610193ad
2016-05-03 17:48:22 -07:00
Steve McKay
9efd34e00c Disable share when dirs selected.
Pass a SelectionDetails object instead of a pile of booleans into updateActionMenu.
Normalized "is feature X enabled" naming.
Normalized menu fiddling in FilesTuner.

Bug: 28467604
Change-Id: Ic88fab78adf02f794ef0c0550443a3c075e7bab6
2016-05-03 15:57:27 -07:00
Vladislav Kaznacheev
067d6fadd9 Collect mime type data correctly for all URIs added to ClipData
Bug: 28452937
Change-Id: I883ae2d22e09000137fa484ef66d5070855cd0ed
2016-05-03 15:53:45 -07:00
The Android Automerger
750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115 2016-04-27 22:14:50 +00:00
Ben Lin
2bf17e4a73 Merge "Safe check so we don\'t move cursor beyond possible pos scope." into nyc-dev am: 2360aa3
am: 88dc2f0

* commit '88dc2f020e05d15d1c4fb45716dbd2cb5b03c7ae':
  Safe check so we don't move cursor beyond possible pos scope.

Change-Id: I6ae85c53f8ac8e5deca816093f27eed5b341aa60
2016-04-27 20:51:50 +00:00
Ben Lin
2360aa33db Merge "Safe check so we don't move cursor beyond possible pos scope." into nyc-dev 2016-04-27 20:33:52 +00:00
Daichi Hirono
5ed8b765f7 Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev am: e597323 am: 95e424f
am: a06606e

* commit 'a06606e7a60064fb8bfe5e036d1d2e8c8e0c52aa':
  Terminate DocumentsUI opened for the specific root.

Change-Id: I505a5975c04e8693fe3178d75c007d9fc33c7fc8
2016-04-27 02:19:22 +00:00
Tomasz Mikolajewski
c6029104d1 Merge "Exclude virtual files from ACTION_SEND." into nyc-dev am: b56bc29 am: 590fede
am: 7030d58

* commit '7030d588262dc805af444114a5b624c123c9a90f':
  Exclude virtual files from ACTION_SEND.

Change-Id: I98b7078abc3b0c5ff270edf9988bcf6911d95b9d
2016-04-27 02:19:01 +00:00
Tomasz Mikolajewski
229f0ed1bb Merge "Fix index computation for quick viewing." into nyc-dev am: 52036c7 am: e4731b3
am: 9dc6c63

* commit '9dc6c63d4a6c8e91429e992717e351d18c76ce8d':
  Fix index computation for quick viewing.

Change-Id: I021f75bf0ee6f9c5002ab4bd2afcc8251306f064
2016-04-27 02:11:21 +00:00
Tomasz Mikolajewski
244dbadbba Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev am: ee6d8be am: 38429fe
am: c296f3a

* commit 'c296f3a6365d18ec90dfbb11cf503db2fc8ab504':
  Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."

Change-Id: I0b3a676cdcc50c6cf91440d1a856d8087835b60a
2016-04-27 02:07:48 +00:00
TreeHugger Robot
a06606e7a6 Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev am: e597323
am: 95e424f

* commit '95e424fa203e1b1e1eb53bcee7e14606404d6f4e':
  Terminate DocumentsUI opened for the specific root.

Change-Id: Ib0e91a946d9b7cfac03bd9ff6b741f6c3931bb74
2016-04-27 01:39:05 +00:00
Tomasz Mikolajewski
7030d58826 Merge "Exclude virtual files from ACTION_SEND." into nyc-dev am: b56bc29
am: 590fede

* commit '590fede04413bb7d8bf563b022f4995565ea6e09':
  Exclude virtual files from ACTION_SEND.

Change-Id: Ia85f4338ec424b28cde4154469af5cbf1a9433b1
2016-04-27 01:39:02 +00:00
TreeHugger Robot
e597323939 Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev 2016-04-27 01:18:44 +00:00
Tomasz Mikolajewski
b56bc29657 Merge "Exclude virtual files from ACTION_SEND." into nyc-dev 2016-04-27 01:11:04 +00:00
Tomasz Mikolajewski
9dc6c63d4a Merge "Fix index computation for quick viewing." into nyc-dev am: 52036c7
am: e4731b3

* commit 'e4731b337370e00fcbda633fc2bd071c96f9673b':
  Fix index computation for quick viewing.

Change-Id: I5ee5cbacbb37e52b60200cc0ce7db8a3958bb63b
2016-04-27 00:43:34 +00:00
Tomasz Mikolajewski
52036c743c Merge "Fix index computation for quick viewing." into nyc-dev 2016-04-27 00:30:46 +00:00
Jeff Sharkey
c296f3a636 Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev am: ee6d8be
am: 38429fe

* commit '38429fe4a604ed352dbf9f666a0380fbc9b008c0':
  Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."

Change-Id: Ifbd1fcff84c3745683aeca4c61bdecedf34fe5eb
2016-04-27 00:15:43 +00:00
Daichi Hirono
99900a0e58 Terminate DocumentsUI opened for the specific root.
If USB is opened in DocumentsUI from storage settings and format it from
context menu, a user expects it goes back to storage settings after
formatting the storage.  However, previous we show Downloads as a result
of redirect from the previous USB storage.

The CL changes the logic for callback so that it finishes the activity
if DocumentsUI is opened for the specific root and the root was removed
while a user stays at the root.

Fixes: 28246076
Change-Id: I5548152fc27fd13bd9b75b3083bcfbdd9f93509e
2016-04-26 16:52:44 +09:00
Tomasz Mikolajewski
f61b0b8440 Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."
This reverts commit 2e4e14789e.

Bug: 28371571
Change-Id: I7aad5eb483c17cccb3485eb22effb677e1ba2160
2016-04-26 11:13:50 +09:00
Tomasz Mikolajewski
f0a56721ae Exclude virtual files from ACTION_SEND.
Bug: 28312221
Change-Id: Ic137ac5e6140cd9e56dc772ada31bb53e451e5f8
2016-04-25 10:21:30 +09:00
Tomasz Mikolajewski
6be540666a Fix index computation for quick viewing.
Bug: 28305994
Change-Id: I8c7abc83bd5ca6f01533a4a7ed0bb995c00833af
2016-04-25 10:00:56 +09:00
Garfield, Tan
3a784cdefb Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev am: a5dd3f3 am: 105fba9
am: f6b562d

* commit 'f6b562d20d64f4f7e8d7ad9f83e27a01f2aa807f':
  Disable view recycling to avoid passing wrong type of view to Item.bindView().

Change-Id: I9729d7de6472991054645ad6c61b8703730c0c8c
2016-04-22 23:50:00 +00:00
Garfield Tan
f6b562d20d Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev am: a5dd3f3
am: 105fba9

* commit '105fba9c08136192a56df867cbae3a11e492a448':
  Disable view recycling to avoid passing wrong type of view to Item.bindView().

Change-Id: Ibe7ec20b6f3ab7ae78a72547c12459307c5b2a92
2016-04-22 23:39:38 +00:00
Ben Lin
71c7565093 Safe check so we don't move cursor beyond possible pos scope.
Bug: 28278372
Change-Id: I7c66b5229ae3a6a1b99bdf0f02bf1f0b8a1c79b2
2016-04-22 16:13:08 -07:00
Garfield Tan
a5dd3f3240 Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev 2016-04-22 22:47:38 +00:00
Garfield, Tan
360a1964a7 DO NOT MERGE: Disable drag n' drop in DocumentsActivity.
Bug: 28318396
Change-Id: If27bc093b873af5395f69d9139d3fd96e50c0a7b
2016-04-21 16:34:37 -07:00
Garfield, Tan
9eb8818059 Disable view recycling to avoid passing wrong type of view to
Item.bindView().

Bug: 28298672

Change-Id: I1f7442ea3c6287da40b3e5fde25b16c2f2a7b685
2016-04-21 14:09:28 -07:00
Ben Lin
185f48b7eb Merge "Enable Ctrl+X cut operations, along with some code refactor." 2016-04-21 19:57:11 +00:00
Ben Lin
5822949696 Reverting 26160443 to fix new bug (old bug no longer reproducible).
Bug: 27790638
Change-Id: I5d442d5162769c9fd022ab706cc0dd1a505c7fad
(cherry picked from commit e590d9139fa5156214f3b137db8afb90efe60a19)
2016-04-21 17:11:46 +00:00
Tomasz Mikolajewski
69e3618f07 Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev 2016-04-21 03:17:03 +00:00
Ben Lin
b1404b774d Enable Ctrl+X cut operations, along with some code refactor.
Bug: 27451823
Change-Id: I062dcbd065434c22a3ffeb33d4cac2b4f9da104b
(cherry picked from commit 5b696f91aa0f12f29be5205647bdc398e2831af8)
2016-04-21 00:12:07 +00:00
Steve McKay
d8c2459b50 Merge "Only show OPEN button as needed." into nyc-dev 2016-04-20 14:25:07 +00:00
Tomasz Mikolajewski
1037af38a4 Do not make files in zip disabled in ACTION_VIEW.
Intent.ACTION_VIEW is only used for browsing ZIP files from Downloads.
FragmentTuner should ignore the MIME type from the MIME type filter.

This CL removes the MIME type filtering logic from FilesTuner, as
I believe FilesActivity is never used for picking items, so there should
be no need to mark any files as disabled.

Bug: 28267117
Change-Id: Iba92f82aca60154674a4bea3265b0f1a3ae296dc
2016-04-20 16:50:25 +09:00
Tomasz Mikolajewski
0fb51357af Merge changes I5e500724,I40cfb12c into nyc-dev
* changes:
  Restrict selection to 1000 items in DocumentsUI.
  Cancel band selection on directory change.
2016-04-20 03:57:28 +00:00
Steve McKay
00c9815d94 Merge "Handle null uris in content changed events." into nyc-dev 2016-04-19 17:10:25 +00:00
Tomasz Mikolajewski
76572d6f19 Restrict selection to 1000 items in DocumentsUI.
Bug: 27208679
Change-Id: I5e500724a3fb9af5b8f59e0c959523da5066b1fd
2016-04-19 08:51:46 +00:00
Tomasz Mikolajewski
4759c9f03f Cancel band selection on directory change.
This is a workaround for N. Ideally we should keep the band selection,
as directory may change very often, eg. during loading, or downloading
a file (every second).

Bug: 27224277
Change-Id: I40cfb12c4f7928c4e0d6e675e91ba30ab3a6ab52
2016-04-19 17:51:05 +09:00
Steve McKay
757fa1b684 Handle null uris in content changed events.
Bug: 28244958
Change-Id: Id3a7adb0ab4a751cfcf6ed3fee4cc6337ce512bb
2016-04-18 17:36:17 -07:00
Felipe Leme
8478bf468e Added extra validation for invalid paths.
In normal circumstances, StorageVolume can only be obtained through
StorageManager and hence it will contain a valid path internally. But
the path could be invalid in at least 2 occations:

- App maliciously changed it using reflection.
- Mounted volume was ejected.

This change improves OpenExternalDirectoryActivity so it returns a
RESULT_CANCELED upon receiveving an invalid path.

BUG: 27962875

Change-Id: Ide43968babaa37961c7b704bd289f44eac952e94
2016-04-18 14:55:15 -07:00
Steve McKay
64bf86503b Only show OPEN button as needed.
Bug: 28182686
Change-Id: I61152015ae5e7b92eead7f42a546ca6055dd426a
2016-04-18 12:22:28 -07:00
TreeHugger Robot
793f859123 Merge "Fallback to Recents when Downloads is not available." into nyc-dev 2016-04-15 23:30:41 +00:00
Steve McKay
8f6387021b Handle delete failure notifications correctly.
Case was omitted in dialog, resulting in UnsupportedOperationException.
Remove a redundant flag check.

Bug: 28204292
Change-Id: I313d61c72596d4a127f61d557af7300f50d26bf0
2016-04-15 11:02:36 -07:00