From 1dfe65e0e640e3f8ba391d8a4d2837794b6d0a23 Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Tue, 21 Apr 2015 17:52:54 -0500 Subject: [PATCH] ActionBarActivity is now AppCompatActivity, which has lots of new internals. http://android-developers.blogspot.com/2015/04/android-support-library-221.html --- .../gramophone/ui/activities/SettingsActivity.java | 9 ++++----- .../gramophone/ui/activities/base/ThemeBaseActivity.java | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java index ecfc8f01..631d7683 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java @@ -29,16 +29,15 @@ import java.util.Set; public class SettingsActivity extends AbsBaseActivity implements ColorChooserDialog.ColorCallback { public static final String TAG = SettingsActivity.class.getSimpleName(); - private Toolbar mToolbar; - @Override protected void onCreate(Bundle savedInstanceState) { setStatusBarTranslucent(!Util.hasLollipopSDK()); super.onCreate(savedInstanceState); setContentView(R.layout.activity_preferences); - mToolbar = (Toolbar) findViewById(R.id.toolbar); - mToolbar.setBackgroundColor(PreferenceUtils.getInstance(this).getThemeColorPrimary()); - setSupportActionBar(mToolbar); + + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar.setBackgroundColor(PreferenceUtils.getInstance(this).getThemeColorPrimary()); + setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); if (savedInstanceState == null) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java index c2baa036..427de40a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java @@ -7,6 +7,7 @@ import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import com.afollestad.materialdialogs.ThemeSingleton; import com.kabouzeid.gramophone.R; @@ -34,7 +35,7 @@ import com.readystatesoftware.systembartint.SystemBarTintManager; * - use a view below the statusBar to color it */ -public abstract class ThemeBaseActivity extends ActionBarActivity implements KabViewsDisableAble { +public abstract class ThemeBaseActivity extends AppCompatActivity implements KabViewsDisableAble { // private boolean mLastDarkTheme; // private int mLastPrimary;