Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wire support for archives to DocumentsUI.

Browse Source 
Bug: 20176812
Change-Id: I8220afa2f53b07aa842bf6ac24fcc62afd4e2617
This commit is contained in:
Tomasz Mikolajewski
2015-11-25 13:01:18 +09:00
parent a99fce54d0
commit 39acff5a36
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
View File

@@ -300,10 +300,11 @@ public abstract class BaseActivity extends Activity {
void onDirectoryCreated(DocumentInfo doc) {
checkArgument(doc.isDirectory());
openDirectory(doc);
openContainerDocument(doc);
}
void openDirectory(DocumentInfo doc) {
void openContainerDocument(DocumentInfo doc) {
checkArgument(doc.isContainer());
mState.stack.push(doc);
mState.stackTouched = true;
onCurrentDirectoryChanged(ANIM_DOWN);

4
packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
View File

@@ -421,8 +421,8 @@ public class DocumentsActivity extends BaseActivity {
@Override
public void onDocumentPicked(DocumentInfo doc, DocumentContext context) {
final FragmentManager fm = getFragmentManager();
if (doc.isDirectory()) {
openDirectory(doc);
if (doc.isContainer()) {
openContainerDocument(doc);
} else if (mState.action == ACTION_OPEN || mState.action == ACTION_GET_CONTENT) {
// Explicit file picked, return
new ExistingFinishTask(doc.derivedUri).executeOnExecutor(getExecutorForCurrentDirectory());

4
packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java
View File

@@ -185,8 +185,8 @@ public class DownloadsActivity extends BaseActivity {
@Override
public void onDocumentPicked(DocumentInfo doc, DocumentContext context) {
final FragmentManager fm = getFragmentManager();
if (doc.isDirectory()) {
openDirectory(doc);
if (doc.isContainer()) {
openContainerDocument(doc);
} else {
// First try managing the document; we expect manager to filter
// based on authority, so we don't grant.

4
packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
View File

@@ -311,8 +311,8 @@ public class FilesActivity extends BaseActivity {
@Override
public void onDocumentPicked(DocumentInfo doc, @Nullable DocumentContext siblings) {
if (doc.isDirectory()) {
openDirectory(doc);
if (doc.isContainer()) {
openContainerDocument(doc);
} else {
openDocument(doc, siblings);
}

8
packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java
View File

@@ -243,6 +243,14 @@ public class DocumentInfo implements Durable, Parcelable {
return (flags & Document.FLAG_DIR_HIDE_GRID_TITLES) != 0;
}
public boolean isArchive() {
return (flags & Document.FLAG_ARCHIVE) != 0;
}
public boolean isContainer() {
return isDirectory() || isArchive();
}
public int hashCode() {
return derivedUri.hashCode() + mimeType.hashCode();
}