diff options
| author | Richard MacGregor <rmacgregor@cyngn.com> | 2015-07-22 17:59:05 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 18:38:24 -0700 |
| commit | 10f847caf3a8a93a4fb6f71ab74bbd6d2041a443 (patch) | |
| tree | 2470ac5a63cb520b6b2fe022b0d60dbbfd89a354 | |
| parent | 6c7b68ad01d067f75d5dc4d2b3a67a373b59a52e (diff) | |
| download | android_packages_apps_CMFileManager-10f847caf3a8a93a4fb6f71ab74bbd6d2041a443.tar.gz android_packages_apps_CMFileManager-10f847caf3a8a93a4fb6f71ab74bbd6d2041a443.tar.bz2 android_packages_apps_CMFileManager-10f847caf3a8a93a4fb6f71ab74bbd6d2041a443.zip | |
Temporarily Remove Icon Layout
CMFilemanager UI is undergoing several updates.
Icon layout is temporarily disabled until it is finished.
Change-Id: I1a03ff12f6aaf0ecfc9c60be3f7890e4a3cdfbb3
| -rw-r--r-- | res/values/arrays.xml | 1 | ||||
| -rw-r--r-- | src/com/cyanogenmod/filemanager/preferences/NavigationLayoutMode.java | 3 | ||||
| -rwxr-xr-x | src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 9d9dca8b..151af464 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -29,7 +29,6 @@ <!-- The strings of the menu for navigation layout mode enumeration --> <string-array name="cm_filemanager_layout_mode" translatable="false"> - <item>@string/layout_icons</item> <item>@string/layout_simple</item> <item>@string/layout_details</item> </string-array> diff --git a/src/com/cyanogenmod/filemanager/preferences/NavigationLayoutMode.java b/src/com/cyanogenmod/filemanager/preferences/NavigationLayoutMode.java index eb572db7..18344752 100644 --- a/src/com/cyanogenmod/filemanager/preferences/NavigationLayoutMode.java +++ b/src/com/cyanogenmod/filemanager/preferences/NavigationLayoutMode.java @@ -24,7 +24,8 @@ public enum NavigationLayoutMode implements ObjectIdentifier { /** * That mode shows a icon based view (icon + name) on a {@link "GridView"}. */ - ICONS(0), + // TODO: Re-enable icon layout mode when fully implemented + //ICONS(0), /** * That mode shows a simple item view (icon + name) on a {@link "ListView"}. */ diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java index 8df7623b..86a7ff05 100755 --- a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java +++ b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java @@ -778,10 +778,11 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe * @param useFlinger If the view should use flinger gesture detection */ public void setUseFlinger(boolean useFlinger) { - if (this.mCurrentMode.compareTo(NavigationLayoutMode.ICONS) == 0) { + // TODO: Re-enable when icons layout implementation is finished + /*if (this.mCurrentMode.compareTo(NavigationLayoutMode.ICONS) == 0) { // Not supported return; - } + }*/ // Set the flinger listener (only when navigate) if (this.mNavigationMode.compareTo(NAVIGATION_MODE.BROWSABLE) == 0) { if (this.mAdapterView instanceof FlingerListView) { @@ -929,12 +930,13 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe //Creates the new layout AdapterView<ListAdapter> newView = null; int itemResourceId = -1; - if (newMode.compareTo(NavigationLayoutMode.ICONS) == 0) { + // TODO: Re-enable when icons layout implementation is finished + /*if (newMode.compareTo(NavigationLayoutMode.ICONS) == 0) { newView = (AdapterView<ListAdapter>)inflate( getContext(), RESOURCE_MODE_ICONS_LAYOUT, null); itemResourceId = RESOURCE_MODE_ICONS_ITEM; - } else if (newMode.compareTo(NavigationLayoutMode.SIMPLE) == 0) { + } else */if (newMode.compareTo(NavigationLayoutMode.SIMPLE) == 0) { newView = (AdapterView<ListAdapter>)inflate( getContext(), RESOURCE_MODE_SIMPLE_LAYOUT, null); itemResourceId = RESOURCE_MODE_SIMPLE_ITEM; |