ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4384 from SeannyM/android-uplevel 

Android: Fix "up one level" button
This commit is contained in:
Markus Wick 2016-10-25 10:24:56 +02:00 committed by GitHub
parent b0e2642883 12db4e4882
commit 1b824da5b6
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AddDirectoryActivity.java
View File

@ -10,10 +10,10 @@ import android.os.Environment;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.Toolbar;
import org.dolphinemu.dolphinemu.BuildConfig;
import org.dolphinemu.dolphinemu.R;
@ -41,7 +41,7 @@ public class AddDirectoryActivity extends AppCompatActivity implements FileAdapt
setContentView(R.layout.activity_add_directory);
mToolbar = (Toolbar) findViewById(R.id.toolbar_folder_list);
setActionBar(mToolbar);
setSupportActionBar(mToolbar);
RecyclerView recyclerView = (RecyclerView) findViewById(R.id.list_files);

14
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java
View File

@ -1,5 +1,6 @@
package org.dolphinemu.dolphinemu.adapters;
import android.os.Environment;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
@ -197,12 +198,15 @@ public final class FileAdapter extends RecyclerView.Adapter<FileViewHolder> impl
public void upOneLevel()
{
File currentDirectory = new File(mPath);
File parentDirectory = currentDirectory.getParentFile();
if (!mPath.equals(Environment.getExternalStorageDirectory().getPath()))
{
File currentDirectory = new File(mPath);
File parentDirectory = currentDirectory.getParentFile();
mFileList = generateFileList(parentDirectory);
notifyDataSetChanged();
mListener.updateSubtitle(mPath);
mFileList = generateFileList(parentDirectory);
notifyDataSetChanged();
mListener.updateSubtitle(mPath);
}
}
/**

2
Source/Android/app/src/main/res/layout/activity_add_directory.xml
View File

@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<Toolbar
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar_folder_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"