Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,245 Commits 3 Branches 0 Tags
906bf903b4c2160080c53a6103494de40fa00d81
Commit Graph

1969 Commits

Author SHA1 Message Date
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
Steve McKay
f9cb0774fb Merge "Finish selection mode after copyto and share..." into nyc-dev am: 94e3b80d5b 
am: 6818cd5540

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

Change-Id: I2d52ff873397d59bddd0bd6a135a88c3c1b503c3
 2016-05-04 21:55:06 +00:00
Steve McKay
6818cd5540 Merge "Finish selection mode after copyto and share..." into nyc-dev 
am: 94e3b80d5b

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

Change-Id: If4a47f84569e1cb58eb4d0f3c8e209e78177e615
 2016-05-04 21:37:39 +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
Steve McKay
01b21d8be8 Merge commit '1d8b98b' into fixMerge 
Change-Id: Ia91b61e43dbf586394b2c4275c4ca05a674c23ae
 2016-05-04 11:49:45 -07: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
Vladislav Kaznacheev
36ad144f6d Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev 
am: e06ef946f4

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

Change-Id: I34a53a199c2c8b133784af81c4b8d6a74da153c9
 2016-05-04 17:05:32 +00:00
Steve McKay
1d8b98bdd3 Merge "Disable share when dirs selected." into nyc-dev 
am: 3fff306827

* commit '3fff306827c6fe998f8569d71ea18da597eb5a85':
  Disable share when dirs selected.

Change-Id: I2dbe0e2081580b5096a60657b5dc35536dc8f873
 2016-05-04 17:05:28 +00:00
Vladislav Kaznacheev
9d17528e7c Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev 
am: e06ef946f4

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

Change-Id: I6f50e3c880cf7ae6f67f6571cdabe6d68cc1f7c1
 2016-05-04 17:05:25 +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
Baligh Uddin
ee3c6c16ea Import translations. DO NOT MERGE 
Change-Id: Ib7dadeb767bbec0b9696a2b2bfaffae32ae9bbb3
Auto-generated-cl: translation import
 2016-05-02 20:15:15 -07:00
Baligh Uddin
b5b4a6e55e Import translations. DO NOT MERGE 
Change-Id: I61a90d45c55e61704154cb3d502ae0e952b44299
Auto-generated-cl: translation import
 2016-05-02 20:03:27 -07:00
Baligh Uddin
3144fadd53 Import translations. DO NOT MERGE 
Change-Id: I0eae6df6f763834bed3ccc874416b4ffc45c86da
Auto-generated-cl: translation import
 2016-05-02 17:51:27 -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
88dc2f020e Merge "Safe check so we don\'t move cursor beyond possible pos scope." into nyc-dev 
am: 2360aa3

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

Change-Id: I6794563ae70782e773bdb83390758120f930fed8
 2016-04-27 20:41:21 +00:00
Ben Lin
140d72803c Merge "Safe check so we don\'t move cursor beyond possible pos scope." into nyc-dev 
am: 2360aa3

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

Change-Id: Iec159a552b3311805f6d3be0b33ce51efa2a36cb
 2016-04-27 20:41:13 +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
Bill Yi
23cd2ffa30 Merge "Import translations. DO NOT MERGE" 2016-04-27 19:55:39 +00:00
Bill Yi
4156eaa411 Import translations. DO NOT MERGE 
Change-Id: I785aa5de30a7ddb63d7486dfcda2ac0e94528180
Auto-generated-cl: translation import
 2016-04-27 05:52:55 -07:00
Bill Yi
6c82c5ab41 Import translations. DO NOT MERGE 
Change-Id: Ice98eb3ed66513d4e324e5f1939006048caec376
Auto-generated-cl: translation import
 2016-04-27 05:43:40 -07:00
Bill Yi
02f9026fa8 Import translations. DO NOT MERGE 
Change-Id: Ia4c532c35db387b2d9a8eb721f3d17f6978aa4b1
Auto-generated-cl: translation import
 2016-04-27 03:49:22 -07: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
Daichi Hirono
95e424fa20 Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev 
am: e597323

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

Change-Id: I7fca164e3191ee9ae4ea622cbf77dfcb700db358
 2016-04-27 01:31:48 +00:00
Tomasz Mikolajewski
590fede044 Merge "Exclude virtual files from ACTION_SEND." into nyc-dev 
am: b56bc29

* commit 'b56bc29657c3de0d957ec01c1c8e959d7354ea2d':
  Exclude virtual files from ACTION_SEND.

Change-Id: I1d1742aacb8cc19a36d8cc9c89a0441dc4ac7a1c
 2016-04-27 01:31:43 +00:00
Daichi Hirono
e69e98c817 Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev 
am: e597323

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

Change-Id: I21768a2d7e2a6b23a803af0d136b83a2b1f9b865
 2016-04-27 01:31:41 +00:00
Tomasz Mikolajewski
b764e7e0bf Merge "Exclude virtual files from ACTION_SEND." into nyc-dev 
am: b56bc29

* commit 'b56bc29657c3de0d957ec01c1c8e959d7354ea2d':
  Exclude virtual files from ACTION_SEND.

Change-Id: I37029f399b59c7f2d72fb9fc68a3d60f1449a8c1
 2016-04-27 01:31:37 +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
e4731b3373 Merge "Fix index computation for quick viewing." into nyc-dev 
am: 52036c7

* commit '52036c743c1fccf004247af35e9c95e12fb0a638':
  Fix index computation for quick viewing.

Change-Id: I25b1c61ee8b162221020f10a2f1dfd4e9e8562c9
 2016-04-27 00:36:27 +00:00
Tomasz Mikolajewski
12898987f0 Merge "Fix index computation for quick viewing." into nyc-dev 
am: 52036c7

* commit '52036c743c1fccf004247af35e9c95e12fb0a638':
  Fix index computation for quick viewing.

Change-Id: Ief946fe886f8a172cd9e75c0e59904293f0335e2
 2016-04-27 00:36:19 +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
Tomasz Mikolajewski
38429fe4a6 Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev 
am: ee6d8be

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

Change-Id: I62bb1b479d521b24d1cf1ef05675ba887973867b
 2016-04-27 00:09:10 +00:00
Tomasz Mikolajewski
7c82c92051 Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev 
am: ee6d8be

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

Change-Id: I94fd56620c42796eb0c8c206d96ddfb1f5a8a436
 2016-04-27 00:08:25 +00:00
Jeff Sharkey
ee6d8be53e Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev 2016-04-27 00:04:02 +00:00
Alan Viverette
72679c2806 Merge "Remove -night qualified resources" into nyc-dev am: 83ca62b am: 98288e22 
am: a535126

* commit 'a535126886a25e0fd39c11247c7a4e9c7dfdfe68':
  Remove -night qualified resources

Change-Id: I0e0b07a0c4ba7183874471b1d7488766300d63fe
 2016-04-26 18:44:38 +00:00
TreeHugger Robot
a535126886 Merge "Remove -night qualified resources" into nyc-dev am: 83ca62b 
am: 98288e22

* commit '98288e224fa8370b1d77baa0fb87a30cb0310ccc':
  Remove -night qualified resources

Change-Id: I381b0967c9c88ce9f99b29ab0af9037d1015e5b7
 2016-04-26 18:41:19 +00:00
Alan Viverette
98288e224f Merge "Remove -night qualified resources" into nyc-dev 
am: 83ca62b

* commit '83ca62bdbe00359a1cf574efc5abfb19c5f57337':
  Remove -night qualified resources

Change-Id: I734b6bea4f4f9136c1e23b18c651f9b7d4dd57ee
 2016-04-26 18:37:53 +00:00