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

1379 Commits

Author SHA1 Message Date
Aga Wronska
bfdf3d74de Merge "Made breadcrumb drop down match mocks" into nyc-dev am: e5a3bb76b8 
am: 9ca0c0564e

* commit '9ca0c0564e4991468b5a1434ac1b1334b7d9cda0':
  Made breadcrumb drop down match mocks
 2016-03-04 22:43:32 +00:00
Aga Wronska
9ca0c0564e Merge "Made breadcrumb drop down match mocks" into nyc-dev 
am: e5a3bb76b8

* commit 'e5a3bb76b8b50aee73d7a7f23af67fc153564c2a':
  Made breadcrumb drop down match mocks
 2016-03-04 22:41:30 +00:00
Aga Wronska
b6db022312 Made breadcrumb drop down match mocks 
Bug: 27136601
Change-Id: I93af07a45defaddd7f5785fac8b686984a889583
 2016-03-04 14:05:39 -08:00
Steve McKay
0c648c6648 Merge "Revert "Hide Files app launcher icon."" into nyc-dev am: 9eb7190af5 
am: 5b7abfb55d

* commit '5b7abfb55d2ce1ffe5e89e6c5e995c34e9eff9e1':
  Revert "Hide Files app launcher icon."
 2016-03-04 20:01:18 +00:00
Steve McKay
5b7abfb55d Merge "Revert "Hide Files app launcher icon."" into nyc-dev 
am: 9eb7190af5

* commit '9eb7190af54f3534afd3887c68cd414b210a1628':
  Revert "Hide Files app launcher icon."
 2016-03-04 19:58:06 +00:00
Steve McKay
9eb7190af5 Merge "Revert "Hide Files app launcher icon."" into nyc-dev 2016-03-04 19:54:36 +00:00
Steve McKay
080d71b130 Revert "Hide Files app launcher icon." 
This reverts commit 24e4604595.

Un-hiding this for continued development in nyc-dev.

Based on conversations between those at higher paygrades, we'll either leave this visible or re-hide prior to next dev release.

Change-Id: I235eb0f593daa7b34ea10ed4c9df4eaa6c68078c
 2016-03-04 19:52:55 +00:00
Steve McKay
4608fbe713 Merge "Hide Files app launcher icon." into nyc-dev am: 58e8d467bd 
am: 3bfedb2054

* commit '3bfedb205406c70d8214d2e6aa42c3cb39ebc87d':
  Hide Files app launcher icon.
 2016-03-04 19:51:14 +00:00
Steve McKay
3bfedb2054 Merge "Hide Files app launcher icon." into nyc-dev 
am: 58e8d467bd

* commit '58e8d467bdb2455f60fd6e8c1963f1dfe28e23c3':
  Hide Files app launcher icon.
 2016-03-04 19:47:58 +00:00
Steve McKay
58e8d467bd Merge "Hide Files app launcher icon." into nyc-dev 2016-03-04 19:42:34 +00:00
Steve McKay
24e4604595 Hide Files app launcher icon. 
Bug: 27498061

Change-Id: Ifc76ef731a623e95839252a6c9483ce3546c9930
 2016-03-04 11:33:46 -08:00
Aga Wronska
ee608e3ad3 Merge "Fixed arranging the views when in tablet landscape layout." into nyc-dev am: 8d07a1d757 
am: 5e3f2740ae

* commit '5e3f2740aee7ecd3664181ab1e60c58c6c5088c0':
  Fixed arranging the views when in tablet landscape layout.
 2016-03-04 19:23:41 +00:00
Aga Wronska
5e3f2740ae Merge "Fixed arranging the views when in tablet landscape layout." into nyc-dev 
am: 8d07a1d757

* commit '8d07a1d7574c93e6cf3e487ebb74d9779047a463':
  Fixed arranging the views when in tablet landscape layout.
 2016-03-04 19:21:29 +00:00
Aga Wronska
8d07a1d757 Merge "Fixed arranging the views when in tablet landscape layout." into nyc-dev 2016-03-04 19:15:59 +00:00
Aga Wronska
511ee39691 Fixed arranging the views when in tablet landscape layout. 
Bug: 27473988
Change-Id: Id0333af9d9c63e1292d234543cd5950ae201f66a
 2016-03-04 11:13:07 -08:00
Tomasz Mikolajewski
3f4f8a0b35 Merge "Add broken assert in performance tests of DocumentsUI." into nyc-dev am: 6d6bbf5f28 
am: e0586b2803

* commit 'e0586b2803cc62cb448daf33e8f8cd97630d0b2d':
  Add broken assert in performance tests of DocumentsUI.
 2016-03-04 02:37:30 +00:00
Tomasz Mikolajewski
e0586b2803 Merge "Add broken assert in performance tests of DocumentsUI." into nyc-dev 
am: 6d6bbf5f28

* commit '6d6bbf5f2808e822326322e03c9d336906ff12e4':
  Add broken assert in performance tests of DocumentsUI.
 2016-03-04 02:35:31 +00:00
Tomasz Mikolajewski
6d6bbf5f28 Merge "Add broken assert in performance tests of DocumentsUI." into nyc-dev 2016-03-04 02:31:41 +00:00
Steve McKay
b245d109b2 Merge "Show proper icons for SD and USB attached storage." into nyc-dev am: eef85e0c02 
am: f3322fccfa

* commit 'f3322fccfa21ce251055b1051788a5b411c28f26':
  Show proper icons for SD and USB attached storage.
 2016-03-03 20:38:07 +00:00
Steve McKay
f3322fccfa Merge "Show proper icons for SD and USB attached storage." into nyc-dev 
am: eef85e0c02

* commit 'eef85e0c02a28b610b4611071749baf48ba67e2f':
  Show proper icons for SD and USB attached storage.
 2016-03-03 19:43:27 +00:00
Steve McKay
eef85e0c02 Merge "Show proper icons for SD and USB attached storage." into nyc-dev 2016-03-03 19:39:18 +00:00
Steve McKay
ba23e54d26 Show proper icons for SD and USB attached storage. 
Use USB icon for MTP devices.

Bug: 26883880
Change-Id: I8ce85ffc915a012dca79a5de1cc7c74361776792
 2016-03-03 10:58:36 -08:00
Tomasz Mikolajewski
58f2ccbedf Add broken assert in performance tests of DocumentsUI. 
Bug: 27370274
Change-Id: Ibdacd82b384d37d76527c622d9986876fe84fcbd
 2016-03-03 18:26:56 +09:00
Steve McKay
908dc9a081 Merge "Correctly determine when to show details cell." into nyc-dev am: 3b8db2dc0e 
am: 78b377246e

* commit '78b377246e75a8565632ca885d2d3795763a8558':
  Correctly determine when to show details cell.
 2016-03-03 03:26:11 +00:00
Steve McKay
78b377246e Merge "Correctly determine when to show details cell." into nyc-dev 
am: 3b8db2dc0e

* commit '3b8db2dc0e4bab06b5cde373c3e10bb5f61e7149':
  Correctly determine when to show details cell.
 2016-03-03 03:24:12 +00:00
Steve McKay
3b8db2dc0e Merge "Correctly determine when to show details cell." into nyc-dev 2016-03-03 03:21:27 +00:00
Aga Wronska
ceb9be3912 Merge "Force show keyboard when presenting FragmentDialogs with EditText." into nyc-dev am: 8755301017 
am: 7289c02961

* commit '7289c02961a94351ed953b40c19c3be0ee3fd526':
  Force show keyboard when presenting FragmentDialogs with EditText.
 2016-03-03 02:26:46 +00:00
Aga Wronska
7289c02961 Merge "Force show keyboard when presenting FragmentDialogs with EditText." into nyc-dev 
am: 8755301017

* commit '87553010172e84feb952c2130f0aba734cdc4f44':
  Force show keyboard when presenting FragmentDialogs with EditText.
 2016-03-03 01:47:03 +00:00
Aga Wronska
8755301017 Merge "Force show keyboard when presenting FragmentDialogs with EditText." into nyc-dev 2016-03-03 01:06:44 +00:00
Aga Wronska
02c532fb54 Force show keyboard when presenting FragmentDialogs with EditText. 
Bug: 26823589
Change-Id: I593ed0e7ef40c9c95c311ca529d3826d73496458
 2016-03-02 16:32:00 -08:00
Steve McKay
1c1219b250 Correctly determine when to show details cell. 
Logic was messed up resulting in no file size and messed up date
    on files.

Change-Id: I02547803de00e1836b20fdf31694ccfd94a8b8f9
 2016-03-02 14:06:20 -08:00
Steve McKay
ec5c7015cc Merge "Don\'t show title in delete confirmation." into nyc-dev am: 8db100e4a3 
am: a1bdc55eb6

* commit 'a1bdc55eb64b6f765afebf925987cc3e1e3d0be3':
  Don't show title in delete confirmation.
 2016-03-02 21:43:48 +00:00
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
Steve McKay
a1bdc55eb6 Merge "Don\'t show title in delete confirmation." into nyc-dev 
am: 8db100e4a3

* commit '8db100e4a3283d05fed2ff00b2931e073261487a':
  Don't show title in delete confirmation.
 2016-03-02 20:09:30 +00:00
Steve McKay
8db100e4a3 Merge "Don't show title in delete confirmation." into nyc-dev 2016-03-02 19:56:21 +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