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

am 73c3c65b: am 567fdd9f: Merge "When launched into empty recents, show drawer." into klp-dev

Browse Source 
* commit '73c3c65b1bb05754c688a76a1dbc79c0120c0915':
  When launched into empty recents, show drawer.
This commit is contained in:
Jeff Sharkey
2013-10-07 15:12:12 -07:00
committed by Android Git Automerger
parent fa117b44bf 73c3c65b1b
commit f76843d520
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,6 +295,11 @@ public class DirectoryFragment extends Fragment {
updateDisplayState(); updateDisplayState();
// When launched into empty recents, show drawer
if (mType == TYPE_RECENT_OPEN && mAdapter.isEmpty() && !state.stackTouched) {
((DocumentsActivity) context).setRootsDrawerOpen(true);
}
// Restore any previous instance state // Restore any previous instance state
final SparseArray<Parcelable> container = state.dirState.remove(mStateKey); final SparseArray<Parcelable> container = state.dirState.remove(mStateKey);
if (container != null && !getArguments().getBoolean(EXTRA_IGNORE_STATE, false)) { if (container != null && !getArguments().getBoolean(EXTRA_IGNORE_STATE, false)) {

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

@@ -109,6 +109,11 @@ public class RecentsCreateFragment extends Fragment {
public void onLoadFinished( public void onLoadFinished(
Loader<List<DocumentStack>> loader, List<DocumentStack> data) { Loader<List<DocumentStack>> loader, List<DocumentStack> data) {
mAdapter.swapStacks(data); mAdapter.swapStacks(data);
// When launched into empty recents, show drawer
if (mAdapter.isEmpty() && !state.stackTouched) {
((DocumentsActivity) context).setRootsDrawerOpen(true);
}
} }
@Override @Override

9
packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java
View File

@@ -142,9 +142,12 @@ public class RootsFragment extends Fragment {
final RootInfo root = ((DocumentsActivity) getActivity()).getCurrentRoot(); final RootInfo root = ((DocumentsActivity) getActivity()).getCurrentRoot();
for (int i = 0; i < mAdapter.getCount(); i++) { for (int i = 0; i < mAdapter.getCount(); i++) {
final Object item = mAdapter.getItem(i); final Object item = mAdapter.getItem(i);
if (Objects.equal(item, root)) { if (item instanceof RootItem) {
mList.setItemChecked(i, true); final RootInfo testRoot = ((RootItem) item).root;
return; if (Objects.equal(testRoot, root)) {
mList.setItemChecked(i, true);
return;
}
} }
} }
} }