Commit Graph

880 Commits

Author SHA1 Message Date
TreeHugger Robot
641517546c Merge "Recycle after return to avoid returning an invalid value." 2016-06-08 02:43:55 +00:00
Garfield, Tan
866858b85a Recycle after return to avoid returning an invalid value.
Also add some main thread assertions.

Change-Id: Id6314d6e92d530ce57a01902b5570381fa20044d
(cherry picked from commit 1a1b9148a2094b4365ff5e65372b1a1eb0282a0a)
2016-06-07 23:30:39 +00:00
Garfield, Tan
3c2bf54e30 Use pool for MotionInputEvents.
Bug: 28987543
Change-Id: I3128320a7d527fdd74ab80165b270be2e5e34476
(cherry picked from commit 2458a15aadca7902744cd7c5f3da8e0779e1e3b8)
2016-06-07 23:30:22 +00:00
Steve McKay
f347eef4c7 Converge toList and getAll methods.
Change-Id: I71ba53947f1840a21a9b1f77523dce8675308c99
2016-06-07 12:26:59 -07:00
Garfield, Tan
d9ddb3ba5b Suppress auto-closing drawer and add ripple effect on spring load roots.
Bug: 28865182
Change-Id: Ief7967e33b9a0d7e94a667172121d8007f78115b
(cherry picked from commit 17182ca46f7a8f3ae03bb8f5a16116246a5fbd91)
2016-06-06 19:01:51 +00:00
Ben Lin
36c5e5de26 Merge "Adding docsui prefix to access metric tags." into nyc-dev am: de862e1cc8 am: 8454626813
am: f5099d7c16

* commit 'f5099d7c163133ecd415a222cca7f3469378169d':
  Adding docsui prefix to access metric tags.

Change-Id: I4722276266d4a53fbc5a61cbbe05a9613dd0a3b8
2016-06-06 18:17:57 +00:00
Ben Lin
de862e1cc8 Merge "Adding docsui prefix to access metric tags." into nyc-dev 2016-06-06 18:04:12 +00:00
Garfield Tan
cd9780abff Merge "Prioritize delete jobs by adding them to a separate thread pool." into nyc-andromeda-dev
Conflicts:
	packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java

Change-Id: I1eb4f265891542f8db59349ce158b192f1b14315
2016-06-02 10:17:59 -07:00
Steve McKay
3c6d499858 Don't assert on uris with stack.
This is legal arrangement when viewing Archives.
Bug: 28923366

Change-Id: I75a26edc8dac865f536a7c5bcdef1ba00b0883f0
(cherry picked from commit a379fad3b9)
2016-05-31 20:32:55 +00:00
TreeHugger Robot
50d3baa543 Merge "Don't assert on uris with stack." 2016-05-31 19:59:42 +00:00
Steve McKay
a379fad3b9 Don't assert on uris with stack.
This is legal arrangement when viewing Archives.
Bug: 28923366

Change-Id: I75a26edc8dac865f536a7c5bcdef1ba00b0883f0
2016-05-31 11:01:43 -07:00
Ian Rogers
0a3c9cd428 Merge "Fix bad locking." 2016-05-31 17:58:58 +00:00
Ian Rogers
22101e2f3a Merge "Fix two confusing naming issues" 2016-05-31 13:56:39 +00:00
Garfield Tan
6402be9575 Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff am: f846d8518b" into nyc-mr1-dev-plus-aosp
am: f4e1c42240

* commit 'f4e1c422405d965f25e98ca4f505c7c269608db2':
  Fix an assertion to avoid crash on deletions in Recent root.

Change-Id: Iafba5b17b7dd89ad9bfdc8e8719f4ade5ff4d8ee
2016-05-27 22:02:59 +00:00
Ian Rogers
d73ff581f3 Fix two confusing naming issues
android.R.string.yes is not "Yes" but "OK"; prefer android.R.string.ok for clarity
android.R.string.no is not "No" but "Cancel"; prefer android.R.string.cancel for clarity
Found by Error Prone.
Bug: 27723540

Change-Id: Ia6f58a7e7543ad1cc4e4722de8d095d1de8df034
2016-05-27 14:40:59 -07:00
Ian Rogers
a5feec52a6 Fix bad locking.
When synchronizing on a field, it should be final to avoid locking on different
objects.
Missing synchronization on use of mRunning caught by Error Prone's @GuardedBy
checker.
Bug: 27723540

Change-Id: I9d7c9e37f8ef5f7f49707bfdf607a6b73b9654d8
2016-05-27 14:30:06 -07:00
Steve McKay
716912e719 Move BandController out of MultiSelectManager.
Improved dependency injection (elimination of propagating dependencies).
This change cleans up MultiSelectManager ahead of other improvements.
Also, cancel band select in response to touch events....else weird things happen.

Change-Id: I261d928ff7eb5d8a50791d5dd9d7202b324efc54
2016-05-26 16:26:39 -07:00
Ben Lin
1a3b676441 Adding docsui prefix to access metric tags.
Bug: 28934495
Change-Id: I44291b887e8aa9f4412ee1e7e1826ea68ffb40b9
2016-05-26 16:19:21 -07:00
Garfield, Tan
01958b11ef Fix an assertion to avoid crash on deletions in Recent root.
Bug: 28917333
Change-Id: I758c01898a6bb45cbf4975a1e7223efddd17a448
2016-05-26 16:06:04 -07:00
Garfield, Tan
6d0b46eb12 Separate paste code from DirectoryFragment.
Also untie DocumentClipper from activities. We'll have a single
DocumentClipper across the app from now on.

Bug: 28742120
Change-Id: Ib9e2537c3499ba2fa0a203ddad3ae71246d5b009
(cherry picked from commit 0cd92d35c533c16b301bd228cce8c68a289407a1)
2016-05-25 18:07:51 +00:00
Garfield, Tan
1ec6f295d1 Load up-to-date thumbnail if the cached one is out of date.
Bug: 28557412
Change-Id: Ib3ef9962249305be22b7a1e49e26350f3596e430
(cherry picked from commit aacb9219a791d2e4415cbbcacc12caed424dff83)
2016-05-24 19:55:33 +00:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Steve McKay
78951ad998 Fix RTL issue in delete dialog.
Bug:28772371
Change-Id: Ia5d3e074ac40b73f21cc83f507735d0918799966
2016-05-19 11:21:41 -07:00
Garfield, Tan
ab7b37214f Enable debug logging.
Change-Id: Ie891efdda96a97286fd22348903e93b36a2a6e83
(cherry picked from commit fbb4e79a06ca02f2aa02724e3e9bd4134a8e515d)
2016-05-18 23:47:37 +00:00
Garfield, Tan
a9d424ab97 Open root list when hovering on the edge in drawer layout.
Bug: 28345294

Change-Id: Ia569003e21aea0641ccc1d2a5e042bdc93f32bb3
(cherry picked from commit 49eda9885e81a32f8a3d7cc7b9f9f15766b2621e)
2016-05-17 21:55:13 +00:00
Garfield, Tan
c9af00d40b Use thumbnail of other sizes if it's missing in current size.
Bug: 26881628

Change-Id: Id7aa6f5c8c1a415f7dd97143a088ba89fae43eea
(cherry picked from commit 614eef86e8ce6dd462e2f91ef5c705dc62bb7c7f)
2016-05-17 18:01:12 +00:00
Steve McKay
935d7d6854 Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev am: fec0d188c1 am: 6fdaf2f2cf
am: b8995b7abc

* commit 'b8995b7abc9cbaa1dcb363c68535a63f4e8768a3':
  Don't show new-window item in Downloads per Gabe.

Change-Id: I54d288582f474ed1a0718a3f6327af7f1814be75
2016-05-13 17:42:44 +00:00
TreeHugger Robot
fec0d188c1 Merge "Don't show new-window item in Downloads per Gabe." into nyc-dev 2016-05-13 17:26:46 +00:00
Ben Lin
c8e00fee20 Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev am: f2413b79c6 am: 6974295274
am: ff23546c2c

* commit 'ff23546c2ca46335cfe0335f72c39f4709c6eebe':
  Removed duplicate call to Metric log, and using private logging method.

Change-Id: Ibf8070a47c2a0e14bd4eb24b322dfebb7c019675
2016-05-11 17:50:06 +00:00
Ben Lin
f2413b79c6 Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev 2016-05-11 17:36:26 +00:00
Steve McKay
f570c771f2 Don't show new-window item in Downloads per Gabe.
Also, fix regression...don't show "internal storage" option in Downloads.
All other modes, fix inconsistencies in presentation of
internal-storage/new-windows commands by eliminating launch mode inference.
Update VolumeInfo and MTP provider to send correct launch mode extra.

Bug: 28691735,28695347
Change-Id: Ic480925f4c8f1beee4da104a2259c1ce5f28a6a1
2016-05-10 16:25:58 -07:00
Garfield, Tan
1d975315b9 Add capability to spring load a root or directory.
Bug: 28242270
Change-Id: I5cbdb7734af8d78015a82fd7b38b1266576c9914
(cherry picked from commit b5e2714d63dc5e74cef69f590b41a161eeca7b80)
2016-05-10 20:39:49 +00:00
Steve McKay
793b8c4a8d Merge "Don\'t persist selection after restore." into nyc-dev am: 522a437786 am: fd5affdc2c
am: 9e3ed23fd0

* commit '9e3ed23fd01f7e85d9fbcfcad4ef2b68f72e2274':
  Don't persist selection after restore.

Change-Id: I1b9beb7ab84c8bba9d94f388234235b1ad7c565d
2016-05-06 22:32:53 +00:00
TreeHugger Robot
522a437786 Merge "Don't persist selection after restore." into nyc-dev 2016-05-06 22:11:14 +00:00
Ben Lin
ae00a14ae3 Removed duplicate call to Metric log, and using private logging method.
Bug: 28554140
Change-Id: I071c50ef5b51de65e71b85453cf83acae5ad6af7
2016-05-06 12:32:15 -07:00
Steve McKay
99544dd0f4 Don't persist selection after restore.
Bug: 28469988
Change-Id: I1fec774d8ebdec13b33262d7fe8e17fccd84b657
2016-05-06 12:27:49 -07:00
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