drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,156 Commits 1 Branch 0 Tags
Commit Graph

534 Commits

Author SHA1 Message Date
Jeff Sharkey
1bf1af0492 am d659f450: Fix the build months later? 
* commit 'd659f450f3d9c113cbd2ddc4f592b7fc64d1c9cf':
  Fix the build months later?
 2015-05-30 18:36:41 +00:00
Jeff Sharkey
d659f450f3 Fix the build months later? 
Change-Id: Ic5902fbe39cf2b536eb75682ad18f06e1ad8983e
 2015-05-30 11:20:45 -07:00
Geoff Mendal
cdd71a3087 Revert "Import translations. DO NOT MERGE" 
This reverts commit f3173d8a1797fd812997b9246502a05df0591363.

Change-Id: I7e24d340c24f7ba4b67a72d54e57c3558caa7267
 2015-05-29 15:33:18 +00:00
Geoff Mendal
f3173d8a17 Import translations. DO NOT MERGE 
Change-Id: I30219f300510a51079cb2e514c00f476590e06d5
Auto-generated-cl: translation import
 2015-05-29 07:31:36 -07:00
Ben Kwa
c016b3ba7d am 7a3b2012: Merge "Ensure that the copy notification is always cancelable." into mnc-dev 
* commit '7a3b2012ea4d079a50edb8aa101a353830219d29':
  Ensure that the copy notification is always cancelable.
 2015-05-27 21:34:10 +00:00
Ben Kwa
7c0ade56f3 Ensure that the copy notification is always cancelable. 
If the CopyService dies or is stopped for whatever reason, the cached
"current" job ID will go to null.  In that case, the cancel intent will
be ignored, and the copy notification can never be dismissed.  Adding a
null check to the handleCancel method of CopyService fixes this.

BUG=21365043
Change-Id: I0615328f6033a313fec79f8b63291c7f7373ea0f
 2015-05-27 09:19:28 -07:00
Geoff Mendal
32156a7586 Import translations. DO NOT MERGE 
Change-Id: Id4da8170bceabc117824f81c25a6019f5584ce0b
Auto-generated-cl: translation import
 2015-05-25 09:53:44 -05:00
Steve McKay
08226358a1 am 4f95bade: Merge "[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!" into mnc-dev 
* commit '4f95badec267c53f76475869b17f6bbccc66d406':
  [mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!
 2015-05-21 20:38:57 +00:00
Steve McKay
4f95badec2 Merge "[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!" into mnc-dev 2015-05-21 20:27:37 +00:00
Steve McKay
574b4bcd1b [mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev! 
BUG=21259006
Change-Id: Ic31dfa1a1cffa4340769c08db3e3cb3fb46e31d5
(cherry picked from commit e04e02d027b731448d68995a202c8867c4985fa3)
 2015-05-21 20:15:31 +00:00
Geoff Mendal
dc038f3246 Import translations. DO NOT MERGE 
Change-Id: Ibc636bc980ceaead21d2eaf2dd813de284341ab0
Auto-generated-cl: translation import
 2015-05-21 06:10:03 -07:00
Daichi Hirono
15a5593309 am b7d072f4: Merge "DocumentUI: Plish the design of footer bottons." into mnc-dev 
* commit 'b7d072f42fd4fcb2e6e2d7a88ede2d4cee05127c':
  DocumentUI: Plish the design of footer bottons.
 2015-05-19 22:34:38 +00:00
Daichi Hirono
e9cbfe8e5a DocumentUI: Plish the design of footer bottons. 
* Remove the directory name from "pick" button.
* Allign buttons at right.
* Fix bug that the pick button turns to be hidden after screen rotation.

BUG=20285152
Change-Id: I909d52f341bf67c5627431a354a9b0ccec152a05
 2015-05-18 11:27:15 +09:00
Steve McKay
3ac67f6cf9 am b3100f4b: Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev 
* commit 'b3100f4b13159deb0b5736aedca1659dfe3c762b':
  Delete StandaloneActivity from M (DO NOT MERGE)
 2015-05-11 16:33:59 +00:00
Steve McKay
b3100f4b13 Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev 2015-05-11 16:21:02 +00:00
Steve McKay
6e02dc8cd6 Delete StandaloneActivity from M (DO NOT MERGE) 
The activity is already disabled by default.
Fix an issue where copy support error handling was attempting to invoke StandaloneActivity.

Change-Id: If15c312a183cae1b2a84517e7f7b3123c11bd619
 2015-05-11 16:19:00 +00:00
Geoff Mendal
ebb3a45a67 Import translations. DO NOT MERGE 
Change-Id: I0999d1abf6951574e9ba7fc6c8a608aaea4540de
Auto-generated-cl: translation import
 2015-05-11 06:14:14 -07:00
Ben Kwa
75597d0dc5 Clean up error handling in CopyService. 
Change-Id: I87b9f2c2cfddc222fbee64578b0a1349508a244f
 2015-05-05 11:58:38 -07:00
Ben Kwa
efb70fd8a0 Merge "Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE" into mnc-dev 2015-05-05 18:54:07 +00:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Ben Kwa
c7a01cfe15 Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE 
Send copy errors to the destination provider.
Big overhaul of tests to make them simpler.
Test that errors during copying are detected and partial copies are
cleaned up.
Test that copying empty directories works properly.

Change-Id: I3fe0e73bdc92c2b6f522857ca5631f6d03d5a666
(cherry picked from commit dae8c378d6c680ae9efa8e1202d9bc92fb0dfb11)
 2015-05-04 20:28:44 +00:00
Steve McKay
5d2c1d54b9 Merge "Ensure sort menu is shown as needed." into mnc-dev 2015-05-04 16:22:43 +00:00
Steve McKay
69aee097a3 Ensure sort menu is shown as needed. 
This also hoists common code for options menu setup into BaseActivity.

Change-Id: Ie87b8188a6c142b2312c92dc0d0bd550f0b1e59f
 2015-05-04 16:21:09 +00:00
Geoff Mendal
b312f926f6 Import translations. DO NOT MERGE 
Change-Id: Ied1d50de849ab195e9f3c9e70c0f8e8dbf9104fe
Auto-generated-cl: translation import
 2015-04-29 07:03:31 -07:00
Geoff Mendal
b3530295b6 Import translations. DO NOT MERGE 
Change-Id: I43378ea885cdb018cd8b8cda5b8be304817e8ee8
Auto-generated-cl: translation import
 2015-04-29 05:18:45 -07:00
Geoff Mendal
f5bc286477 Import translations. DO NOT MERGE 
Change-Id: I6f6d4bf043ac98defa9d3b70d0a01d48f4aa6ace
Auto-generated-cl: translation import
 2015-04-28 01:56:40 -07:00
Geoff Mendal
ba474807b3 Import translations. DO NOT MERGE 
Change-Id: I614f77f977e342c3b374da72501c1b8de0a7abf3
Auto-generated-cl: translation import
 2015-04-27 07:18:39 -07:00
Geoff Mendal
e67b93962d Import translations. DO NOT MERGE 
Change-Id: I4bcfc305120a6a1342978d6763628b08c7086a8a
Auto-generated-cl: translation import
 2015-04-27 05:34:04 -07:00
Geoff Mendal
9648cb6ee5 Import translations. DO NOT MERGE 
Change-Id: Id361b7e87a85cb100addc326bc74ce7db4ba10f2
Auto-generated-cl: translation import
 2015-04-26 18:32:53 -07:00
Geoff Mendal
c9f5cb8caf Import translations. DO NOT MERGE 
Change-Id: I79db3fdb8e2c5e86259a6c5cefe5e0790a07bc92
Auto-generated-cl: translation import
 2015-04-24 23:44:04 -07:00
Ben Kwa
62539a220c Move extension checking code into FileUtils. 
Move code for checking file extensions and MIME types from
ExternalStorageProvider into android.os.FileUtils, so it can be used by
other clients (e.g. DownloadsProvider).

BUG=20157955

Change-Id: Ib16a16af723c21fb8d2912c8917dfd68653ea6fa
 2015-04-23 16:14:20 -07:00
Tomasz Mikolajewski
366459ee59 Merge "Update strings for the copy error dialog to match the latest specs." 2015-04-23 17:13:33 +00:00
Tomasz Mikolajewski
eafb267bd9 Update strings for the copy error dialog to match the latest specs. 
Change-Id: I9adeff3e7e9435237b4b3337e4c687eec39b0335
 2015-04-23 19:10:14 +02:00
Tomasz Mikolajewski
f8c3f322a2 Implement retrying copying in case of an error in DocumentsUI. 
Change-Id: I9ed1eb624aa30fb7e65d4d424ebd988dfc06d030
 2015-04-23 18:51:33 +02:00
Daichi Hirono
517577ea96 DocumentsUI: Stop to override fixed size of dialog in CreateDirectoryDialog. 
Previously CreateDirectoryDialog overrides fixed size defined in the application
theme. As a result, the dialog is shown as vertically long.

The CL specifies explicitly specifies the default theme for dialog when creating
the dialog to stop override the application theme.

BUG=20239384
Change-Id: I7227bd91705c32f5196b666bbe94ff32b5cb4af8
 2015-04-23 15:02:15 +09:00
Steve McKay
2b973ea93b Merge "Update activities to clear search term when a root that doesn't support search is selected by the user." 2015-04-23 01:34:21 +00:00
Alan Viverette
7de07a60c2 Merge "Implement DayNight theme for DocumentsUI" 2015-04-23 00:13:02 +00:00
Alan Viverette
40a38f3062 Implement DayNight theme for DocumentsUI 
Also fixes tint colors for icons to use themed colorControlNormal.

Bug: 20421157
Change-Id: I110a1d95f763332e7ca76cf8ab4125bd4d9a075e
 2015-04-22 16:51:08 -07:00
Steve McKay
a78a3694b5 Update activities to clear search term when a root that doesn't support search is selected by the user. 
BUG=20495230

Change-Id: Iee2e2bd80dea6d368cad0911117e3759bdfe37d9
 2015-04-22 15:57:11 -07:00
Steve McKay
a56104d74d Merge "Reduce code duplication between DocumentsActivity and StandaloneActivity." 2015-04-22 18:13:21 +00:00
Ben Kwa
4b1ebb4f4f Merge "Disable copying from Recents." 2015-04-22 17:46:19 +00:00
Ben Kwa
c5979d98cf Disable copying from Recents. 
Recents view contains a whole bunch of content aggregated from
potentially many different sources.  Dealing with all these in a single
copy operation can be complex, so for simplicity, copying from recents
view is disabled.

BUG=20487641

Change-Id: I6052e62ee0446da7741f13abfed97044e147dd7d
 2015-04-22 10:33:53 -07:00
Steve McKay
ef3e2cf35f Reduce code duplication between DocumentsActivity and StandaloneActivity. 
Ensure StandaloneActivity has toolbar management consistent w/ DocumentsActivity.
Introduce a separate SearchManager class since there seemed to be a sufficient body of logic and state to warrant the separation.

Change-Id: I87d9da40095c6de575b124005ca34a8c0b0b4b35
 2015-04-22 09:44:30 -07:00
Geoff Mendal
e58224f266 Import translations. DO NOT MERGE 
Change-Id: I0893584e89cfc86caea9f5f5f43f8d7dd94873d8
Auto-generated-cl: translation import
 2015-04-22 05:20:51 -07:00
Ben Kwa
448dbbbf0e Implement some tests for com.android.documentsui.CopyService. 
- Add a unit test for CopyService.
- Make some changes to StubProvider to make it more configurable, for
  testing.

Change-Id: I3d726099feaf6b7a3fdd40bf2449f4ee3e848d77
 2015-04-21 15:39:12 -07:00
Daichi Hirono
d00d70a6ce Merge "DocumentsUI: Save source file list into BaseActivity.State." 2015-04-21 03:56:21 +00:00
Geoff Mendal
3ac2032586 Import translations. DO NOT MERGE 
Change-Id: If0652f6630dbfb0110c8b13a479cb59c1af22bcc
Auto-generated-cl: translation import
 2015-04-20 05:21:16 -07:00
Daichi Hirono
cf0e9ace5e DocumentsUI: Save source file list into BaseActivity.State. 
This is needed so that the activity does not lost the list on screen rotation.

BUG=20283251

Change-Id: I8f971bab0a0ce2066fd5fea29b98b355cb948ea6
 2015-04-20 20:01:49 +09:00
Jeff Sharkey
4cfb3130a4 Merge "Enable the copy feature." 2015-04-19 04:35:39 +00:00
Geoff Mendal
67a8ad3b65 Import translations. DO NOT MERGE 
Change-Id: If7a0cfd12e5ed935ad521bd48eb82dd6cad3084f
Auto-generated-cl: translation import
 2015-04-17 20:22:14 -07:00