Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2185846e authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Gerrit Code Review
Browse files

cmfm: delete obsolete themes resources



Change-Id: I3fc24f739b16ab6104a4349f0c8efe0eff790fbd
Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>
parent b62df7af
Loading
Loading
Loading
Loading
+0 −7
Original line number Original line Diff line number Diff line
@@ -18,19 +18,12 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
include $(CLEAR_VARS)


LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_SRC_FILES += $(call all-java-files-under, themes/src)
LOCAL_SRC_FILES += $(call all-java-files-under, libs/android-syntax-highlight/src)
LOCAL_SRC_FILES += $(call all-java-files-under, libs/android-syntax-highlight/src)
LOCAL_SRC_FILES += $(call all-java-files-under, libs/color-picker-view/src)
LOCAL_SRC_FILES += $(call all-java-files-under, libs/color-picker-view/src)


LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_STATIC_JAVA_LIBRARIES += libtruezip
LOCAL_STATIC_JAVA_LIBRARIES += libtruezip
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4


LOCAL_RESOURCE_DIR += $(addprefix $(LOCAL_PATH)/, themes/res res)

LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true

LOCAL_PACKAGE_NAME := CMFileManager
LOCAL_PACKAGE_NAME := CMFileManager
LOCAL_CERTIFICATE := platform
LOCAL_CERTIFICATE := platform
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+0 −11
Original line number Original line Diff line number Diff line
@@ -206,17 +206,6 @@
      </intent-filter>
      </intent-filter>
    </activity>
    </activity>


    <activity
      android:name=".themes.ThemeActivity"
      android:label="@string/app_name"
      android:permission="com.cyanogenmod.filemanager.permissions.READ_THEME"
      android:exported="true">
      <intent-filter>
        <action android:name="com.cyanogenmod.filemanager.actions.MAIN_THEME" />
        <category android:name="com.cyanogenmod.filemanager.categories.THEME" />
      </intent-filter>
    </activity>

    <activity
    <activity
      android:name=".console.secure.SecureStorageKeyPromptDialog$SecureStorageKeyPromptActivity"
      android:name=".console.secure.SecureStorageKeyPromptDialog$SecureStorageKeyPromptActivity"
      android:label="@string/app_name"
      android:label="@string/app_name"
+0 −8
Original line number Original line Diff line number Diff line
@@ -17,14 +17,6 @@
<PreferenceScreen
<PreferenceScreen
  xmlns:android="http://schemas.android.com/apk/res/android">
  xmlns:android="http://schemas.android.com/apk/res/android">


    <!-- Use default theme color scheme -->
    <SwitchPreference
      android:key="cm_filemanager_editor_sh_use_theme_default"
      android:title="@string/pref_syntax_sh_use_theme_default"
      android:summary="@string/pref_syntax_sh_use_theme_default_desc"
      android:persistent="true"
      android:defaultValue="true" />

    <!-- Editor behaviour -->
    <!-- Editor behaviour -->
    <PreferenceCategory
    <PreferenceCategory
      android:key="editor_sh_items_category"
      android:key="editor_sh_items_category"

res/xml/preferences_themes.xml

deleted100644 → 0
+0 −33
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 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.
 -->

<PreferenceScreen
  xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Search Results -->
    <PreferenceCategory
      android:key="themes_selection"
      android:title="@string/pref_themes_selection_category">

      <!-- Themes selector -->
      <com.cyanogenmod.filemanager.ui.preferences.ThemeSelectorPreference
        android:key="cm_filemanager_theme"
        android:persistent="true"
        android:defaultValue="com.cyanogenmod.filemanager:light" />

    </PreferenceCategory>

</PreferenceScreen>
+1 −22
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.IntentFilter;
import android.content.res.Configuration;
import android.content.res.Configuration;
import android.graphics.Color;
import android.graphics.Typeface;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.net.Uri;
@@ -184,8 +183,7 @@ public class EditorActivity extends Activity implements TextWatcher {
                                });
                                });
                            }
                            }


                        } else if (key.compareTo(FileManagerSettings.SETTINGS_EDITOR_SH_USE_THEME_DEFAULT.getId()) == 0 ||
                        } else if (key.compareTo(FileManagerSettings.SETTINGS_EDITOR_SH_COLOR_SCHEME.getId()) == 0 ) {
                                   key.compareTo(FileManagerSettings.SETTINGS_EDITOR_SH_COLOR_SCHEME.getId()) == 0 ) {
                            // Ignore in binary files
                            // Ignore in binary files
                            if (activity.mBinary) return;
                            if (activity.mBinary) return;


@@ -415,11 +413,6 @@ public class EditorActivity extends Activity implements TextWatcher {
        public int getColor(String id, String resid, int def) {
        public int getColor(String id, String resid, int def) {
            final Context ctx = EditorActivity.this;
            final Context ctx = EditorActivity.this;
            try {
            try {
                // Is default theme color scheme enabled?
                if (isDefaultThemeColorScheme()) {
                    return ThemeManager.getCurrentTheme(ctx).getColor(ctx, resid);
                }

                // Use the user-defined settings
                // Use the user-defined settings
                int[] colors = getUserColorScheme();
                int[] colors = getUserColorScheme();
                HighlightColors[] schemeColors = HighlightColors.values();
                HighlightColors[] schemeColors = HighlightColors.values();
@@ -444,20 +437,6 @@ public class EditorActivity extends Activity implements TextWatcher {
            return def;
            return def;
        }
        }


        /**
         * Method that returns if we should return the default theme color scheme or not
         *
         * @return boolean Whether return the default theme color scheme or not
         */
        private boolean isDefaultThemeColorScheme() {
            Boolean defaultValue =
                    (Boolean)FileManagerSettings.
                                SETTINGS_EDITOR_SH_USE_THEME_DEFAULT.getDefaultValue();
            return Preferences.getSharedPreferences().getBoolean(
                        FileManagerSettings.SETTINGS_EDITOR_SH_USE_THEME_DEFAULT.getId(),
                        defaultValue.booleanValue());
        }

        /**
        /**
         * Method that returns the user-defined color scheme
         * Method that returns the user-defined color scheme
         *
         *
Loading