From a292c6c77638cc9d4e33f43485755d246592317a Mon Sep 17 00:00:00 2001 From: DF1E Date: Wed, 28 Jan 2015 19:16:00 +0100 Subject: [PATCH] material design for erveryone.. use appcompat on all API's because of its backward compatibility --- AndroidManifest.xml | 16 +- res/layout/about_settings.xml | 217 +++--- res/layout/activity_main.xml | 21 +- res/layout/advanced_settings.xml | 369 +++++----- res/layout/bookmark_activity.xml | 2 + res/layout/display_settings.xml | 413 ++++++------ res/layout/general_settings.xml | 391 +++++------ res/layout/license_activity.xml | 55 +- res/layout/privacy_settings.xml | 569 ++++++++-------- res/layout/settings.xml | 637 +++++++++--------- res/layout/toolbar.xml | 30 +- res/values-v21/styles.xml | 70 -- res/values/styles.xml | 197 ++---- .../lightning/AboutSettingsActivity.java | 16 +- .../lightning/AdvancedSettingsActivity.java | 15 +- .../browser/lightning/BookmarkActivity.java | 17 +- .../lightning/DisplaySettingsActivity.java | 16 +- .../lightning/GeneralSettingsActivity.java | 16 +- .../lightning/PrivacySettingsActivity.java | 16 +- .../browser/lightning/SettingsActivity.java | 19 +- 20 files changed, 1512 insertions(+), 1590 deletions(-) delete mode 100644 res/values-v21/styles.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bf0a64c..d544fd7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -105,7 +105,7 @@ android:name="acr.browser.lightning.SettingsActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/settings" - android:theme="@style/Theme.SettingsTheme" > + android:theme="@style/Theme.LightTheme" > @@ -116,7 +116,7 @@ android:name="acr.browser.lightning.GeneralSettingsActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/settings_general" - android:theme="@style/Theme.SettingsTheme" > + android:theme="@style/Theme.LightTheme" > @@ -127,7 +127,7 @@ android:name="acr.browser.lightning.DisplaySettingsActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/settings_display" - android:theme="@style/Theme.SettingsTheme" > + android:theme="@style/Theme.LightTheme" > @@ -138,7 +138,7 @@ android:name="acr.browser.lightning.PrivacySettingsActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/settings_privacy" - android:theme="@style/Theme.SettingsTheme" > + android:theme="@style/Theme.LightTheme" > @@ -149,7 +149,7 @@ android:name="acr.browser.lightning.AdvancedSettingsActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/settings_advanced" - android:theme="@style/Theme.SettingsTheme" > + android:theme="@style/Theme.LightTheme" > @@ -160,7 +160,7 @@ android:name="acr.browser.lightning.AboutSettingsActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/settings_about" - android:theme="@style/Theme.SettingsTheme" > + android:theme="@style/Theme.LightTheme" > @@ -185,7 +185,7 @@ android:name="acr.browser.lightning.LicenseActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/licenses" - android:theme="@style/Theme.SettingsTheme" > + android:theme="@style/Theme.LightTheme" > @@ -196,7 +196,7 @@ android:name="acr.browser.lightning.BookmarkActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/bookmark_settings" - android:theme="@style/Theme.SettingsTheme" > + android:theme="@style/Theme.LightTheme" > diff --git a/res/layout/about_settings.xml b/res/layout/about_settings.xml index a858cef..2ac4c44 100644 --- a/res/layout/about_settings.xml +++ b/res/layout/about_settings.xml @@ -1,130 +1,137 @@ - + android:layout_height="match_parent" + android:orientation="vertical" > - + + + android:layout_height="match_parent" > - + android:orientation="vertical" > - - - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - - - - - - - + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:orientation="vertical" > + + + + + + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - - - - - - - + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:orientation="vertical" > + + + + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:orientation="vertical" > + + + + + + - - - - - - - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 69fa454..5e41c1b 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -1,6 +1,6 @@ - + + + + + + diff --git a/res/layout/advanced_settings.xml b/res/layout/advanced_settings.xml index 949d5fc..6cfc8a1 100644 --- a/res/layout/advanced_settings.xml +++ b/res/layout/advanced_settings.xml @@ -1,226 +1,233 @@ - + android:layout_height="match_parent" + android:orientation="vertical" > - + + + android:layout_height="match_parent" > - + android:orientation="vertical" > - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - - - + + + + + + + - + android:layout_alignParentRight="true" + android:layout_centerVertical="true" /> + - + + - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - + + + + + + + + + - + + + + + + + + + + + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - - - - - + android:layout_alignParentRight="true" + android:layout_centerVertical="true" /> + - - - + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:orientation="vertical" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - - - - - - - - - - - - - - - - - - + + - + + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/bookmark_activity.xml b/res/layout/bookmark_activity.xml index c9e9878..f7eeae5 100644 --- a/res/layout/bookmark_activity.xml +++ b/res/layout/bookmark_activity.xml @@ -3,6 +3,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" > + + - + android:layout_height="match_parent" + android:orientation="vertical" > - - - - - - - - - - + - - - - - - + - - + android:orientation="vertical" > - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - - - - - - - - - + android:layout_alignParentRight="true" + android:layout_centerVertical="true" /> + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - - - - + + + + + - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - + + + + + + + + + - - - + + - - + + + + + + + + + + + + + + - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - + - + + - + + - - - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - + + - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/res/layout/general_settings.xml b/res/layout/general_settings.xml index 7db3d6a..cb9fc56 100644 --- a/res/layout/general_settings.xml +++ b/res/layout/general_settings.xml @@ -1,231 +1,238 @@ - + android:layout_height="match_parent" + android:orientation="vertical" > - + + + android:layout_height="match_parent" > - + android:orientation="vertical" > - - - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - - - - - - - + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:orientation="vertical" > + + + + + + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - - - - - - - - - + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:orientation="vertical" > + + + + + + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - - - - - - - - - + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:orientation="vertical" > + + + + + + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - - - - - - - - - + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:orientation="vertical" > + + + + + + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - - - + + + + + + + - - - - - - + android:layout_alignParentRight="true" + android:layout_centerVertical="true" /> + - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/res/layout/license_activity.xml b/res/layout/license_activity.xml index 61a0bfa..5eddf7b 100644 --- a/res/layout/license_activity.xml +++ b/res/layout/license_activity.xml @@ -3,6 +3,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" > + + - + - + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginLeft="5dp" + android:layout_marginRight="5dp" + android:background="#cdcdcd" /> + + - + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginLeft="5dp" + android:layout_marginRight="5dp" + android:background="#cdcdcd" /> + + + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginLeft="5dp" + android:layout_marginRight="5dp" + android:background="#cdcdcd" /> + + - + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginLeft="5dp" + android:layout_marginRight="5dp" + android:background="#cdcdcd" /> + + \ No newline at end of file diff --git a/res/layout/privacy_settings.xml b/res/layout/privacy_settings.xml index 5d37202..50cb4b5 100644 --- a/res/layout/privacy_settings.xml +++ b/res/layout/privacy_settings.xml @@ -1,336 +1,343 @@ - + android:layout_height="match_parent" + android:orientation="vertical" > - + - - - - - - + - - + android:orientation="vertical" > - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - - - - - + android:layout_alignParentRight="true" + android:layout_centerVertical="true" /> + - - - - - - - + + - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - + + + + + + + + + - - - - - + + - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - + - - - - - + + + + + - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - + - + + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - - - - - + android:layout_alignParentRight="true" + android:layout_centerVertical="true" /> + - + + + - + + + + + + + + + - + + - - - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - + + - + + - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - - - + + - + + - - - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - + + - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/res/layout/settings.xml b/res/layout/settings.xml index 27667b0..0002463 100644 --- a/res/layout/settings.xml +++ b/res/layout/settings.xml @@ -1,375 +1,380 @@ - - - + android:layout_height="match_parent" + android:orientation="vertical" > - - - - - + - - - + - - - - + android:orientation="vertical" > - - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - + - - - + + + + + - - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - + - - - + + + + + - - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - + - - - + + + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > + + + + + - - + - - - - - - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingRight="10dp" + android:paddingTop="10dp" > - + - - + + + - + - - - - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - + + - - - + + - + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > - + + - - - - + - + - + + + + + android:background="?android:attr/listChoiceBackgroundIndicator" + android:minHeight="60dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" > + + + + + - - + android:text="@string/settings_advanced" + android:textAppearance="?android:attr/textAppearanceMedium" /> + - + - + - \ No newline at end of file + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml index 1dcc2ac..c14cd50 100644 --- a/res/layout/toolbar.xml +++ b/res/layout/toolbar.xml @@ -1,26 +1,10 @@ - - - - - - - \ No newline at end of file + android:layout_height="?attr/actionBarSize" + android:background="?colorPrimary" + android:minHeight="?attr/actionBarSize" + custom:contentInsetEnd="0dp" + custom:contentInsetStart="0dp" /> diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml deleted file mode 100644 index 8e5de74..0000000 --- a/res/values-v21/styles.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index 01673eb..ead8e95 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,129 +1,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/acr/browser/lightning/AboutSettingsActivity.java b/src/acr/browser/lightning/AboutSettingsActivity.java index 6991f31..e51a0c6 100644 --- a/src/acr/browser/lightning/AboutSettingsActivity.java +++ b/src/acr/browser/lightning/AboutSettingsActivity.java @@ -3,8 +3,6 @@ */ package acr.browser.lightning; -import android.app.ActionBar; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -12,6 +10,8 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.net.Uri; import android.os.Bundle; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -19,7 +19,7 @@ import android.view.WindowManager; import android.widget.RelativeLayout; import android.widget.TextView; -public class AboutSettingsActivity extends Activity { +public class AboutSettingsActivity extends ActionBarActivity { // mPreferences variables private SharedPreferences mPreferences; @@ -31,11 +31,11 @@ public class AboutSettingsActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.about_settings); - ActionBar actionBar = getActionBar(); - if (actionBar != null) { - actionBar.setHomeButtonEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(true); - } + // set up ActionBar + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { diff --git a/src/acr/browser/lightning/AdvancedSettingsActivity.java b/src/acr/browser/lightning/AdvancedSettingsActivity.java index 17ac463..bb399d2 100644 --- a/src/acr/browser/lightning/AdvancedSettingsActivity.java +++ b/src/acr/browser/lightning/AdvancedSettingsActivity.java @@ -3,13 +3,14 @@ */ package acr.browser.lightning; -import android.app.ActionBar; import android.app.Activity; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.os.Bundle; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -21,7 +22,7 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -public class AdvancedSettingsActivity extends Activity { +public class AdvancedSettingsActivity extends ActionBarActivity { // mPreferences variables private static final int API = android.os.Build.VERSION.SDK_INT; @@ -37,11 +38,11 @@ public class AdvancedSettingsActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.advanced_settings); - ActionBar actionBar = getActionBar(); - if (actionBar != null) { - actionBar.setHomeButtonEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(true); - } + // set up ActionBar + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { diff --git a/src/acr/browser/lightning/BookmarkActivity.java b/src/acr/browser/lightning/BookmarkActivity.java index 0539a93..3f51af2 100644 --- a/src/acr/browser/lightning/BookmarkActivity.java +++ b/src/acr/browser/lightning/BookmarkActivity.java @@ -4,8 +4,6 @@ import java.io.File; import java.util.Arrays; import java.util.Comparator; -import android.app.ActionBar; -import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.app.Dialog; @@ -13,13 +11,15 @@ import android.content.DialogInterface; import android.content.SharedPreferences; import android.os.Bundle; import android.os.Environment; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; import android.widget.LinearLayout; import android.widget.TextView; -public class BookmarkActivity extends Activity implements OnClickListener { +public class BookmarkActivity extends ActionBarActivity implements OnClickListener { private BookmarkManager mBookmarkManager; private boolean mSystemBrowser; @@ -32,14 +32,13 @@ public class BookmarkActivity extends Activity implements OnClickListener { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.bookmark_activity); - ActionBar actionBar = getActionBar(); - if (actionBar != null) { - actionBar.setHomeButtonEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(true); - } + // set up ActionBar + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); LinearLayout exportBackup = (LinearLayout) findViewById(R.id.exportBackup); LinearLayout importBackup = (LinearLayout) findViewById(R.id.importBackup); diff --git a/src/acr/browser/lightning/DisplaySettingsActivity.java b/src/acr/browser/lightning/DisplaySettingsActivity.java index b1b015e..8329505 100644 --- a/src/acr/browser/lightning/DisplaySettingsActivity.java +++ b/src/acr/browser/lightning/DisplaySettingsActivity.java @@ -3,13 +3,13 @@ */ package acr.browser.lightning; -import android.app.ActionBar; -import android.app.Activity; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.os.Bundle; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -19,7 +19,7 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.RelativeLayout; -public class DisplaySettingsActivity extends Activity { +public class DisplaySettingsActivity extends ActionBarActivity { // mPreferences variables private static final int API = android.os.Build.VERSION.SDK_INT; @@ -33,11 +33,11 @@ public class DisplaySettingsActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.display_settings); - ActionBar actionBar = getActionBar(); - if (actionBar != null) { - actionBar.setHomeButtonEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(true); - } + // set up ActionBar + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { diff --git a/src/acr/browser/lightning/GeneralSettingsActivity.java b/src/acr/browser/lightning/GeneralSettingsActivity.java index ef112ca..e059993 100644 --- a/src/acr/browser/lightning/GeneralSettingsActivity.java +++ b/src/acr/browser/lightning/GeneralSettingsActivity.java @@ -3,15 +3,15 @@ */ package acr.browser.lightning; -import android.app.ActionBar; import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; -import android.content.DialogInterface.OnCancelListener; import android.content.SharedPreferences; import android.graphics.Color; import android.os.Bundle; import android.os.Environment; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.Toolbar; import android.util.Log; import android.util.TypedValue; import android.view.MenuItem; @@ -26,7 +26,7 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -public class GeneralSettingsActivity extends Activity { +public class GeneralSettingsActivity extends ActionBarActivity { // mPreferences variables private static final int API = android.os.Build.VERSION.SDK_INT; @@ -47,11 +47,11 @@ public class GeneralSettingsActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.general_settings); - ActionBar actionBar = getActionBar(); - if (actionBar != null) { - actionBar.setHomeButtonEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(true); - } + // set up ActionBar + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { diff --git a/src/acr/browser/lightning/PrivacySettingsActivity.java b/src/acr/browser/lightning/PrivacySettingsActivity.java index c256d48..7700ef4 100644 --- a/src/acr/browser/lightning/PrivacySettingsActivity.java +++ b/src/acr/browser/lightning/PrivacySettingsActivity.java @@ -3,8 +3,6 @@ */ package acr.browser.lightning; -import android.app.ActionBar; -import android.app.Activity; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -13,6 +11,8 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.provider.Browser; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -24,7 +24,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.RelativeLayout; import android.widget.TextView; -public class PrivacySettingsActivity extends Activity { +public class PrivacySettingsActivity extends ActionBarActivity { // mPreferences variables private static final int API = android.os.Build.VERSION.SDK_INT; @@ -40,11 +40,11 @@ public class PrivacySettingsActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.privacy_settings); - ActionBar actionBar = getActionBar(); - if (actionBar != null) { - actionBar.setHomeButtonEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(true); - } + // set up ActionBar + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { diff --git a/src/acr/browser/lightning/SettingsActivity.java b/src/acr/browser/lightning/SettingsActivity.java index d632e53..fa5c444 100644 --- a/src/acr/browser/lightning/SettingsActivity.java +++ b/src/acr/browser/lightning/SettingsActivity.java @@ -4,7 +4,6 @@ package acr.browser.lightning; import android.annotation.SuppressLint; -import android.app.ActionBar; import android.app.Activity; import android.app.AlertDialog; import android.content.Context; @@ -16,6 +15,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Bundle; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -28,7 +29,7 @@ import android.widget.RelativeLayout; import android.widget.Switch; import info.guardianproject.onionkit.ui.OrbotHelper; -public class SettingsActivity extends Activity { +public class SettingsActivity extends ActionBarActivity { private static int API = android.os.Build.VERSION.SDK_INT; private SharedPreferences.Editor mEditPrefs; @@ -44,7 +45,7 @@ public class SettingsActivity extends Activity { mActivity = this; init(); } - + @Override public boolean onOptionsItemSelected(MenuItem item) { finish(); @@ -53,13 +54,13 @@ public class SettingsActivity extends Activity { @SuppressLint("NewApi") public void init() { - // mPreferences storage - ActionBar actionBar = getActionBar(); - if (actionBar != null) { - actionBar.setHomeButtonEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(true); - } + // set up ActionBar + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + // mPreferences storage mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0); if (mPreferences.getBoolean(PreferenceConstants.HIDE_STATUS_BAR, false)) { getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,