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

Merge "Fix focus issues in directory fragment * Empty directory view gets focus when shown * Skip opening drawer when showing empty search results * Fix typo" into nyc-dev

Browse Source 
am: f9b78bb69d

* commit 'f9b78bb69db70a7b10d38ed958baf24ba96d1380':
  Fix focus issues in directory fragment     * Empty directory view gets focus when shown     * Skip opening drawer when showing empty search results     * Fix typo
This commit is contained in:
Aga Wronska
2016-02-16 18:37:49 +00:00
committed by android-build-merger
parent e9c4bc2c45 f9b78bb69d
commit 5bfded9c4d
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/DocumentsUI/res/layout/fragment_directory.xml
View File

@@ -46,6 +46,8 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/window_background"
android:focusable="true"
android:focusableInTouchMode="true"
android:visibility="gone">
<LinearLayout

2
packages/DocumentsUI/src/com/android/documentsui/State.java
View File

@@ -153,7 +153,7 @@ public class State implements android.os.Parcelable {
return mStackTouched;
}
public boolean initialiLocationHasChanged() {
public boolean initialLocationHasChanged() {
return mInitialRootChanged || mInitialDocChanged;
}

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

@@ -889,12 +889,14 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi
imageView.setImageResource(drawable);
mEmptyView.setVisibility(View.VISIBLE);
mEmptyView.requestFocus();
mRecView.setVisibility(View.GONE);
}
private void showDirectory() {
mEmptyView.setVisibility(View.GONE);
mRecView.setVisibility(View.VISIBLE);
mRecView.requestFocus();
}
private String findCommonMimeType(List<String> mimeTypes) {

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

@@ -249,9 +249,10 @@ public abstract class FragmentTuner {
@Override
void onModelLoaded(Model model, @ResultType int resultType) {
if (DEBUG) Log.d(TAG, "Handling model loaded. Has Location shcnage: " + mState.initialiLocationHasChanged());
if (DEBUG) Log.d(TAG, "Handling model loaded. Has Location shcnage: " + mState.initialLocationHasChanged());
// When launched into empty root, open drawer.
if (model.isEmpty() && !mState.initialiLocationHasChanged()) {
if (model.isEmpty() && !mState.initialLocationHasChanged()
&& resultType != DirectoryFragment.TYPE_SEARCH) {
if (DEBUG) Log.d(TAG, "Showing roots drawer cuz stuffs empty.");
// This noops on layouts without drawer, so no need to guard.