CMFileManager: Hide cmcc "easy mode" behind overlay config.

Change-Id: I4d905c118e0e76c12555d5fac8d0bc83d4499923

diff --git a/res/values/config.xml b/res/values/config.xml
new file mode 100644 (file)
index 0000000..540e3a2
--- /dev/null
+++ b/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <bool name="cmcc_show_easy_mode">false</bool>
+</resources>
\ No newline at end of file

diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 00028af..e062b42 100644 (file)
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -1061,7 +1061,8 @@ public class NavigationActivity extends Activity
                 final int index = mDrawerBookmarks.indexOfChild(v);
                 final Bookmark bookmark = mBookmarks.get(index);
 
-                boolean showEasyMode = (mSdBookmarks.contains(bookmark));
+                boolean showEasyMode = (mSdBookmarks.contains(bookmark)) &&
+                        getResources().getBoolean(R.bool.cmcc_show_easy_mode);
 
                 // try to navigate to the bookmark path
                 try {
@@ -1629,6 +1630,9 @@ public class NavigationActivity extends Activity
                 break;
             }
         }
+
+        needsEasyMode = needsEasyMode
+                && getResources().getBoolean(R.bool.cmcc_show_easy_mode);
         if (needsEasyMode) {
             performShowEasyMode();
         } else {