Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261,999 Commits 3 Branches 0 Tags
d4e70720ef7ada2d5e040dcadd2ba47b87fdead4
Commit Graph

1999 Commits

Author SHA1 Message Date
Baligh Uddin
d4e70720ef Merge "Import translations. DO NOT MERGE" 2016-05-18 17:48:35 +00:00
Ben Lin
fa833c3d65 Merge "Initial effort toward fixing Suppress tests by integration of Espresso." 2016-05-18 01:13:41 +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
Ben Lin
da75c243d5 Initial effort toward fixing Suppress tests by integration of Espresso. 
Bug: 27533946
Change-Id: I0286ff6d4c53b464180e3100b7219e766ca09de3
(cherry picked from commit 80c050b656030e070f27708bc4da5f5c7fc6cac6)
 2016-05-16 20:45:40 +00:00
Baligh Uddin
5d92d35e6a Import translations. DO NOT MERGE 
Change-Id: I7f0ef1b102e8489d95d91f481897c99c70d73bb3
Auto-generated-cl: translation import
 2016-05-16 12:52:53 -07: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
Steve McKay
6fdaf2f2cf Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev 
am: fec0d188c1

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

Change-Id: Ic8d6afb5e38c1ded0ca7750be4ac4822aefbe6c1
 2016-05-13 17:31:35 +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
6974295274 Merge "Removed duplicate call to Metric log, and using private logging method." into nyc-dev 
am: f2413b79c6

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

Change-Id: I497f0822da0d42d59b025623e61167aa5d157396
 2016-05-11 17:44:05 +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
Ben Lin
ba92ba5cc3 Merge "Add support for search in DownloadManager." 2016-05-10 23:32:03 +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
Ben Lin
ce763d8bac Add support for search in DownloadManager. 
Bug: 26524617
Change-Id: I41c0f92381bec8ad06db73b25ec67466f368b55c
 2016-05-10 21:45:25 +00: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
Delphine Martin
26ef8c0fdf Merge "Set jack.assert.policy value to \'always\'" into nyc-mr1-dev-plus-aosp 
am: 13daf5583e

* commit '13daf5583e8408315cacfc554777d091f0662ab3':
  Set jack.assert.policy value to 'always'

Change-Id: I3e9e8c620a4a4478186bca5a6e445bc4e62b96e4
 2016-05-10 16:19:46 +00:00
Delphine Martin
355421460b Set jack.assert.policy value to 'always' 
The policy value 'enable' does not exist anymore
and was replaced by 'always'

(cherry-picked from 2a6b5c63c0)

Change-Id: I233a555821a84d917e3b3ec923b5baffc18bd2d2
 2016-05-10 15:35:06 +00:00
Delphine Martin
d90f6d3772 Set jack.assert.policy value to 'always' 
The policy value 'enable' does not exist anymore
and was replaced by 'always'

(cherry-picked from 2a6b5c63c0)

Change-Id: I233a555821a84d917e3b3ec923b5baffc18bd2d2
 2016-05-10 15:33:42 +00:00
Delphine Martin
2a6b5c63c0 Set jack.assert.policy value to 'always' 
The policy value 'enable' does not exist anymore
and was replaced by 'always'

Change-Id: I233a555821a84d917e3b3ec923b5baffc18bd2d2
 2016-05-10 14:42:33 +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
Steve McKay
fd5affdc2c Merge "Don\'t persist selection after restore." into nyc-dev 
am: 522a437786

* commit '522a4377863339d9486c833f5a39f8047576bfee':
  Don't persist selection after restore.

Change-Id: I9f9be7b8a5ffc0a3374cef0902ffeeee2add6d91
 2016-05-06 22:22:42 +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
20898f682b Merge "Fix regression, show internal storage option..." into nyc-dev 
am: 9a76143ef5

* commit '9a76143ef550a547aefed81acbad5d380cc33393':
  Fix regression, show internal storage option...

Change-Id: I70003518063b682b15b50bc075a923ae96815af2
 2016-05-06 15:19:05 +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
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
d67e16af40 Merge "Finish selection mode after copyto and share..." into nyc-dev 
am: 94e3b80d5b

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

Change-Id: Ie856df59740386cd3df6efdd39ff08983bfc0eb7
 2016-05-04 21:37:43 +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
Steve McKay
5283f95e42 Merge "Disable share when dirs selected." into nyc-dev 
am: 3fff306827

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

Change-Id: I72d12308b30261e23c5c6a0c25a22521f1371501
 2016-05-04 17:05:38 +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