Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
237,206 Commits 3 Branches 0 Tags
f60eb330c8f51211ea41834ab0fd03ea3635d5fc
Commit Graph

1344 Commits

Author SHA1 Message Date
Ben Kwa
f60eb330c8 Merge "Tweak root item layouts." into nyc-dev am: f8d6fa2c5a 
am: fed032e1a8

* commit 'fed032e1a88a526895ba1659bb3b7a3f9c489d82':
  Tweak root item layouts.
 2016-03-02 20:41:17 +00:00
Steve McKay
24dd9ad0c0 Merge "Always show intern storage." into nyc-dev am: b4672ef6df 
am: 1788dfd223

* commit '1788dfd223c7c62005b8c1e98cd25737f685a912':
  Always show intern storage.
 2016-03-02 20:32:39 +00:00
Ben Kwa
fed032e1a8 Merge "Tweak root item layouts." into nyc-dev 
am: f8d6fa2c5a

* commit 'f8d6fa2c5a42b9adaa7a745bc9c9feaeb3800cc3':
  Tweak root item layouts.
 2016-03-02 19:45:05 +00:00
Ben Kwa
f8d6fa2c5a Merge "Tweak root item layouts." into nyc-dev 2016-03-02 19:39:06 +00:00
Steve McKay
1788dfd223 Merge "Always show intern storage." into nyc-dev 
am: b4672ef6df

* commit 'b4672ef6dfbaf416981539d515ad1489d7d0bc87':
  Always show intern storage.
 2016-03-02 19:02:19 +00:00
Steve McKay
b4672ef6df Merge "Always show intern storage." into nyc-dev 2016-03-02 18:49:28 +00:00
Steve McKay
7c4395804e Always show intern storage. 
Only show debug root when devel mode is enabled.
Remove all traces of "advanced".

Bug: 27297398

Change-Id: Ie7e8be282531bd245351d56ababa8ca625c10fd2
 2016-03-02 10:47:59 -08:00
Geoff Mendal
a302da37a7 Import translations. DO NOT MERGE 
Change-Id: If6f96f29b8c300b1edc27cf0725dfe3492465e7d
Auto-generated-cl: translation import
 2016-03-02 07:14:03 -08:00
Geoff Mendal
f8d7211167 Import translations. DO NOT MERGE 
Change-Id: I671e94d18c2b904ab6df30551a559badc6fbc17b
Auto-generated-cl: translation import
 2016-03-02 05:21:09 -08:00
Tomasz Mikolajewski
a9d74f30ad Merge "Fix DocumentUI\'s perf tests compile failure." into nyc-dev am: 0d26fdb6cd 
am: d191d076b8

* commit 'd191d076b8f94c9001044daf78b5ef1e8cfec0a7':
  Fix DocumentUI's perf tests compile failure.
 2016-03-02 09:26:32 +00:00
Tomasz Mikolajewski
d191d076b8 Merge "Fix DocumentUI\'s perf tests compile failure." into nyc-dev 
am: 0d26fdb6cd

* commit '0d26fdb6cd3c4637ec2c4db7467c739991285a0b':
  Fix DocumentUI's perf tests compile failure.
 2016-03-02 09:17:10 +00:00
Tomasz Mikolajewski
0d26fdb6cd Merge "Fix DocumentUI's perf tests compile failure." into nyc-dev 2016-03-02 09:00:48 +00:00
Tomasz Mikolajewski
f4628336b2 Fix DocumentUI's perf tests compile failure. 
It compiled locally, but not on the APCT.

Bug: 27370274
Change-Id: I7f10f3bf5b370d8e92311febfdcae133148e1312
 2016-03-02 17:57:46 +09:00
Tomasz Mikolajewski
4b8397c438 Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev am: ed82931cae 
am: 6b99f43c2c

* commit '6b99f43c2cd3b3f4d8d9b768ca1060a47e07d8e9':
  Add a missing include in DocumentsUI Android.mk.
 2016-03-02 08:56:59 +00:00
Tomasz Mikolajewski
f08502ef1a Merge "Fix broken tests due to uninitialized roots." into nyc-dev am: 621a71c342 
am: 5882b829e6

* commit '5882b829e67d74b47eb4643a785dc63f15d92167':
  Fix broken tests due to uninitialized roots.
 2016-03-02 08:28:58 +00:00
Tomasz Mikolajewski
d27dc7f34b Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev am: 1a06789959 
am: 53622d2950

* commit '53622d2950681d0e3ed7dd0a7cb3397a678a7884':
  Add scaffolds for performance tests of DocumentsUI
 2016-03-02 08:25:05 +00:00
Tomasz Mikolajewski
6b99f43c2c Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev 
am: ed82931cae

* commit 'ed82931cae2c867288d3caf0ec04417ee59f73c5':
  Add a missing include in DocumentsUI Android.mk.
 2016-03-02 08:20:49 +00:00
Tomasz Mikolajewski
ed82931cae Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev 2016-03-02 08:06:04 +00:00
Tomasz Mikolajewski
04049407a8 Add a missing include in DocumentsUI Android.mk. 
Without it, perf tests were not built on APCT.

Bug: 27370274
Change-Id: Ie154526d240bb9d1b4cce6fc089d502bf808c366
 2016-03-02 17:03:47 +09:00
Steve McKay
7ab86daa6c Merge "Fix roots filtering for move operations." into nyc-dev am: de5ec832b1 
am: c3cfd763a9

* commit 'c3cfd763a92fad5fe7496b8673f9c5077d534176':
  Fix roots filtering for move operations.
 2016-03-02 06:44:26 +00:00
Tomasz Mikolajewski
5882b829e6 Merge "Fix broken tests due to uninitialized roots." into nyc-dev 
am: 621a71c342

* commit '621a71c342ab9c101b51a3b04db62792cfdbdcad':
  Fix broken tests due to uninitialized roots.
 2016-03-02 06:20:36 +00:00
Steve McKay
48953b3913 Merge "Ensure directory names are aligned correctly..." into nyc-dev am: d6689d99f7 
am: 2eb8bc2aca

* commit '2eb8bc2aca71e42551b002d1fd4099d7b7622a54':
  Ensure directory names are aligned correctly...
 2016-03-02 05:50:03 +00:00
Tomasz Mikolajewski
53622d2950 Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev 
am: 1a06789959

* commit '1a06789959fe66c21adc32319bd51601b414b112':
  Add scaffolds for performance tests of DocumentsUI
 2016-03-02 05:44:17 +00:00
Tomasz Mikolajewski
cf057efaff Fix broken tests due to uninitialized roots. 
Change-Id: I014657cab86ffa17290ab8990f0adaa6f6451e15
 2016-03-02 14:40:43 +09:00
Steve McKay
b1c69486ce Merge "Don\'t assert against Recents title." into nyc-dev am: d511a090d2 
am: 567e4d0e5c

* commit '567e4d0e5c823be6eea76ce7908fbf9384720302':
  Don't assert against Recents title.
 2016-03-02 05:39:25 +00:00
Tomasz Mikolajewski
1a06789959 Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev 2016-03-02 05:35:04 +00:00
Tomasz Mikolajewski
ae6d6b494c Add scaffolds for performance tests of DocumentsUI 
Bug: 27370274
Change-Id: I14dea1b85cd84c8bb3c0eee27b2954108bfa4f8b
 2016-03-02 13:01:11 +09:00
Steve McKay
c3cfd763a9 Merge "Fix roots filtering for move operations." into nyc-dev 
am: de5ec832b1

* commit 'de5ec832b10b155d1d61de4eedb5171da3a76a9c':
  Fix roots filtering for move operations.
 2016-03-02 02:31:41 +00:00
Steve McKay
de5ec832b1 Merge "Fix roots filtering for move operations." into nyc-dev 2016-03-02 01:33:33 +00:00
Steve McKay
ea9ec291ed Fix roots filtering for move operations. 
Add test coverage for the Downloads case.
This was a regression to my recent cleanup of RootInfo.
Fixed logic to not exclude basically *everything* when a
    directory is in the set of files to be copied.

Bug: 27303346
Change-Id: I4d5608e0d8d95448b027b20107a11a7a5e46d45e
 2016-03-02 01:32:30 +00:00
Steve McKay
2eb8bc2aca Merge "Ensure directory names are aligned correctly..." into nyc-dev 
am: d6689d99f7

* commit 'd6689d99f71d3fed88b67d410a59b378d2abe791':
  Ensure directory names are aligned correctly...
 2016-03-01 23:11:49 +00:00
Steve McKay
567e4d0e5c Merge "Don\'t assert against Recents title." into nyc-dev 
am: d511a090d2

* commit 'd511a090d26b91ab5954906cebfe81ae130c24bf':
  Don't assert against Recents title.
 2016-03-01 22:49:32 +00:00
Steve McKay
d6689d99f7 Merge "Ensure directory names are aligned correctly..." into nyc-dev 2016-03-01 22:30:15 +00:00
Steve McKay
d511a090d2 Merge "Don't assert against Recents title." into nyc-dev 2016-03-01 21:39:27 +00:00
Steve McKay
355d82b67e Don't assert against Recents title. 
It was causing a failure.

Bug: 27383076
Change-Id: Ieb4693783831443e05f32333c181371b0eb4fb93
 2016-03-01 13:36:22 -08:00
Felipe Leme
a917f1b5fd Merge "Created metric events for scoped directory access API." into nyc-dev am: c50bf8e33e 
am: 8127a3cd75

* commit '8127a3cd751aacaa9f9d89dcedeb6cb254c006ff':
  Created metric events for scoped directory access API.
 2016-03-01 20:27:59 +00:00
Felipe Leme
8127a3cd75 Merge "Created metric events for scoped directory access API." into nyc-dev 
am: c50bf8e33e

* commit 'c50bf8e33e67c26b5dc4fd18ec665d2985fd42e7':
  Created metric events for scoped directory access API.
 2016-03-01 20:15:23 +00:00
Steve McKay
8b8a6fd193 Ensure directory names are aligned correctly... 
In list view...and don't show dir dates, even when present.
In fact, no details on folders at all when in list view.
Also improve layout of files without details (if they exist).

Bug: 27406730
Change-Id: Ida4b5f99666c4a145ca98a3c15c480e59a76b4a6
 2016-03-01 11:49:21 -08:00
Felipe Leme
3e166b27fc Created metric events for scoped directory access API. 
BUG: 27334821
Change-Id: I8a1bfc328dcd26b42bb66884d14b34ad11aa232f
 2016-03-01 10:12:58 -08:00
Tomasz Mikolajewski
3186277d88 Merge "Remove revealLauncher and revealApp from tests." into nyc-dev am: 88d5592ff2 
am: 32b9036075

* commit '32b9036075ae1a37877fb674c2074201d09c5f5a':
  Remove revealLauncher and revealApp from tests.
 2016-03-01 02:28:22 +00:00
Tomasz Mikolajewski
32b9036075 Merge "Remove revealLauncher and revealApp from tests." into nyc-dev 
am: 88d5592ff2

* commit '88d5592ff2f27806fa28fe4b5ceadd1e1fb860f6':
  Remove revealLauncher and revealApp from tests.
 2016-03-01 02:22:25 +00:00
Tomasz Mikolajewski
88d5592ff2 Merge "Remove revealLauncher and revealApp from tests." into nyc-dev 2016-03-01 01:38:52 +00:00
Steve McKay
ca479e9c5e Merge "Update preconditions to be asserts..." into nyc-dev am: 9e9bce724e 
am: 0ff8c1f89f

* commit '0ff8c1f89f1d8c37d7c9cd649fd5e4016afdbc46':
  Update preconditions to be asserts...
 2016-02-29 23:03:19 +00:00
Steve McKay
0ff8c1f89f Merge "Update preconditions to be asserts..." into nyc-dev 
am: 9e9bce724e

* commit '9e9bce724e73c4d553dc1ff0ff8f80289487f609':
  Update preconditions to be asserts...
 2016-02-29 23:01:23 +00:00
Steve McKay
a1f7680f53 Update preconditions to be asserts... 
Which are now supported by Jack.
Retain a few preconditions checks that enforce contract.
Disable the one assert we had...because it failed in tests.

Change-Id: I2f6cb01e1af1534be4428ce4a3ee625a163dd163
 2016-02-29 14:47:40 -08:00
Ben Kwa
b6cd661e24 Merge "Clean up drag-n-drop." into nyc-dev am: bfbf22b029 
am: 12886be27d

* commit '12886be27d61c4f699d2cf1f39932e3871e0e153':
  Clean up drag-n-drop.
 2016-02-29 15:36:37 +00:00
Ben Kwa
12886be27d Merge "Clean up drag-n-drop." into nyc-dev 
am: bfbf22b029

* commit 'bfbf22b029f23972799a9ba6cc3869aac1c4f5b5':
  Clean up drag-n-drop.
 2016-02-29 15:31:24 +00:00
Ben Kwa
bfbf22b029 Merge "Clean up drag-n-drop." into nyc-dev 2016-02-29 15:27:29 +00:00
Geoff Mendal
c78750a61b Import translations. DO NOT MERGE 
Change-Id: Ibf90518a4ea01d2cfc6bb3d43867ae2b499dfea8
Auto-generated-cl: translation import
 2016-02-29 07:16:29 -08:00
Geoff Mendal
427caa9c0f Import translations. DO NOT MERGE 
Change-Id: I8e7524ba933eb347f5be8fdb1a3ceedcd84b8ba7
Auto-generated-cl: translation import
 2016-02-29 05:21:23 -08:00