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

Commit 92a6d7c3 authored by Jorge Ruesga's avatar Jorge Ruesga
Browse files

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: default avatarJorge Ruesga <jorge@ruesga.com>
parent 46f14830

src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

src/com/cyanogenmod/filemanager/activities/EditorActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -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);

src/com/cyanogenmod/filemanager/activities/NavigationActivity.java

+4 −11
Original line number Diff line number Diff line
@@ -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);

src/com/cyanogenmod/filemanager/activities/PickerActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -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();

src/com/cyanogenmod/filemanager/activities/SearchActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -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);