diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2014-03-17 00:56:47 +0100 |
---|---|---|
committer | Jorge Ruesga <jorge@ruesga.com> | 2014-03-17 00:56:47 +0100 |
commit | 92a6d7c343363131cbd812d93b9a96edd4e0daa7 (patch) | |
tree | ebdf6df25ca9661fbbb901437cb0c05adc18c03d | |
parent | 46f148309d811462ae07d117110084501e0a53e0 (diff) | |
download | android_packages_apps_CMFileManager-92a6d7c343363131cbd812d93b9a96edd4e0daa7.tar.gz android_packages_apps_CMFileManager-92a6d7c343363131cbd812d93b9a96edd4e0daa7.tar.bz2 android_packages_apps_CMFileManager-92a6d7c343363131cbd812d93b9a96edd4e0daa7.zip |
CMFM: Set theme before setContentView
This allow to proper set the theme of system views
Change-Id: Ib3d2baf884a1edc299f99aeff0d884d9d4352df1
JIRA: CYAN-2850
Issue: https://jira.cyanogenmod.org/browse/CYAN-2850
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
7 files changed, 25 insertions, 11 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java b/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java index ae3a7c8f..c2e8d334 100644 --- a/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java +++ b/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java @@ -69,6 +69,7 @@ public class ChangeLogActivity extends Activity implements OnCancelListener, OnD IntentFilter filter = new IntentFilter(); filter.addAction(FileManagerSettings.INTENT_THEME_CHANGED); registerReceiver(this.mNotificationReceiver, filter); + applyTheme(); //Save state super.onCreate(state); diff --git a/src/com/cyanogenmod/filemanager/activities/EditorActivity.java b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java index 68f91f31..52da2f75 100644 --- a/src/com/cyanogenmod/filemanager/activities/EditorActivity.java +++ b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java @@ -534,6 +534,10 @@ public class EditorActivity extends Activity implements TextWatcher { // Generate a random separator this.mHexLineSeparator = UUID.randomUUID().toString(); + // Set the theme before setContentView + Theme theme = ThemeManager.getCurrentTheme(this); + theme.setBaseTheme(this, false); + //Set the main layout of the activity setContentView(R.layout.editor); diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java index 68852945..759d7550 100644 --- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java +++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java @@ -29,7 +29,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.database.Cursor; -import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.net.Uri; import android.nfc.NfcAdapter; @@ -39,9 +38,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Parcelable; import android.os.storage.StorageVolume; -import android.transition.Visibility; import android.util.Log; -import android.view.Gravity; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; @@ -51,17 +48,11 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; -import android.widget.ArrayAdapter; -import android.widget.BaseAdapter; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.ListAdapter; import android.widget.ListPopupWindow; -import android.widget.ListView; import android.widget.PopupWindow; -import android.widget.ProgressBar; -import android.widget.RelativeLayout; import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; @@ -106,7 +97,6 @@ import com.cyanogenmod.filemanager.ui.widgets.ActionBarDrawerToggle; import com.cyanogenmod.filemanager.ui.widgets.Breadcrumb; import com.cyanogenmod.filemanager.ui.widgets.ButtonItem; import com.cyanogenmod.filemanager.ui.widgets.DrawerLayout; -import com.cyanogenmod.filemanager.ui.widgets.FlingerListView; import com.cyanogenmod.filemanager.ui.widgets.NavigationCustomTitleView; import com.cyanogenmod.filemanager.ui.widgets.NavigationView; import com.cyanogenmod.filemanager.ui.widgets.NavigationView.OnNavigationRequestMenuListener; @@ -123,7 +113,6 @@ import com.cyanogenmod.filemanager.util.StorageHelper; import java.io.File; import java.io.FileNotFoundException; -import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -352,6 +341,10 @@ public class NavigationActivity extends Activity filter.addAction(Intent.ACTION_TIMEZONE_CHANGED); registerReceiver(this.mNotificationReceiver, filter); + // Set the theme before setContentView + Theme theme = ThemeManager.getCurrentTheme(this); + theme.setBaseTheme(this, false); + //Set the main layout of the activity setContentView(R.layout.navigation); diff --git a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java index fdf50993..52297519 100644 --- a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java +++ b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java @@ -138,6 +138,10 @@ public class PickerActivity extends Activity filter.addAction(FileManagerSettings.INTENT_THEME_CHANGED); registerReceiver(this.mNotificationReceiver, filter); + // Set the theme before setContentView + Theme theme = ThemeManager.getCurrentTheme(this); + theme.setBaseTheme(this, true); + // Initialize the activity init(); diff --git a/src/com/cyanogenmod/filemanager/activities/SearchActivity.java b/src/com/cyanogenmod/filemanager/activities/SearchActivity.java index a3b6b2ae..d09dcbf7 100644 --- a/src/com/cyanogenmod/filemanager/activities/SearchActivity.java +++ b/src/com/cyanogenmod/filemanager/activities/SearchActivity.java @@ -279,6 +279,10 @@ public class SearchActivity extends Activity filter.addAction(FileManagerSettings.INTENT_THEME_CHANGED); registerReceiver(this.mNotificationReceiver, filter); + // Set the theme before setContentView + Theme theme = ThemeManager.getCurrentTheme(this); + theme.setBaseTheme(this, false); + //Set in transition overridePendingTransition(R.anim.translate_to_right_in, R.anim.hold_out); diff --git a/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java b/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java index d61b10b0..57e2670e 100644 --- a/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java +++ b/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java @@ -98,6 +98,10 @@ public class ShortcutActivity extends Activity implements OnCancelListener, OnDi filter.addAction(FileManagerSettings.INTENT_THEME_CHANGED); registerReceiver(this.mNotificationReceiver, filter); + // Set the theme before setContentView + Theme theme = ThemeManager.getCurrentTheme(this); + theme.setBaseTheme(this, true); + //Save state super.onCreate(state); diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/SettingsPreferences.java b/src/com/cyanogenmod/filemanager/activities/preferences/SettingsPreferences.java index e38d0ad1..057d9c8b 100644 --- a/src/com/cyanogenmod/filemanager/activities/preferences/SettingsPreferences.java +++ b/src/com/cyanogenmod/filemanager/activities/preferences/SettingsPreferences.java @@ -74,6 +74,10 @@ public class SettingsPreferences extends PreferenceActivity { filter.addAction(FileManagerSettings.INTENT_THEME_CHANGED); registerReceiver(this.mNotificationReceiver, filter); + // Set the theme before setContentView + Theme theme = ThemeManager.getCurrentTheme(this); + theme.setBaseTheme(this, false); + //Initialize action bars initTitleActionBar(); |