From 6fb9081394376a7d189cd07c66119a8c8f4a67c3 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 25 Aug 2016 18:40:00 +0800
Subject: [PATCH] Fix merge issue

---
 .../java/com/topjohnwu/magisk/ModulesFragment.java    |  6 +++++-
 app/src/main/res/menu/menu_module.xml                 | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/menu/menu_module.xml

diff --git a/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java b/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
index d21a40c60..55d2a4685 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
@@ -9,14 +9,15 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 
 import com.topjohnwu.magisk.module.Module;
-import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
@@ -25,6 +26,9 @@ import butterknife.ButterKnife;
 
 public class ModulesFragment extends Fragment {
 
+    private static final String MAGISK_PATH = "/magisk";
+    private static final String MAGISK_CACHE_PATH = "/cache/magisk";
+
     private static List<Module> listModules = new ArrayList<>();
     private static List<Module> listModulesCache = new ArrayList<>();
 
diff --git a/app/src/main/res/menu/menu_module.xml b/app/src/main/res/menu/menu_module.xml
new file mode 100644
index 000000000..89c86877c
--- /dev/null
+++ b/app/src/main/res/menu/menu_module.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/force_reload"
+        android:icon="@drawable/ic_refresh"
+        android:title="@string/force_reload"
+        app:showAsAction="always"/>
+
+</menu>
\ No newline at end of file