diff --git a/res/mipmap-hdpi/ic_launcher.png b/res/mipmap-hdpi/ic_launcher.png
index 35fd947..5465139 100644
Binary files a/res/mipmap-hdpi/ic_launcher.png and b/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher.png b/res/mipmap-xhdpi/ic_launcher.png
index 69f2252..0b49f0a 100644
Binary files a/res/mipmap-xhdpi/ic_launcher.png and b/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher.png b/res/mipmap-xxhdpi/ic_launcher.png
index 95c4fe3..df428d5 100644
Binary files a/res/mipmap-xxhdpi/ic_launcher.png and b/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher.png b/res/mipmap-xxxhdpi/ic_launcher.png
index f970a6d..6e97e3a 100644
Binary files a/res/mipmap-xxxhdpi/ic_launcher.png and b/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 6019678..5c568df 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -27,12 +27,11 @@
- #00000000
- @null
- @color/gray_medium
- - @drawable/ic_action_back
- @color/gray_dark
- @color/black
- @color/gray_medium
+ - @drawable/ic_action_back
- @drawable/ic_action_forward
- - @style/LightActionBar
- @style/overFlowButtonStyle
@@ -49,12 +48,11 @@
- false
- @null
- @color/gray_medium
- - @drawable/ic_action_back
- @color/gray_dark
- @color/black
- @color/gray_medium
- - @drawable/ic_action_forward
- - @style/LightActionBar
+ - @drawable/ic_action_back_dark
+ - @drawable/ic_action_forward_dark
- @style/overFlowButtonStyle
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 366a6b7..780ccab 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -27,12 +27,11 @@
- @drawable/list_bg
- @null
- @color/gray_medium
- - @drawable/ic_action_back
- @color/gray_dark
- @color/black
- @color/gray_medium
+ - @drawable/ic_action_back
- @drawable/ic_action_forward
- - @style/LightActionBar
- @style/overFlowButtonStyle
@@ -49,10 +48,10 @@
- @drawable/list_bg
- @null
- @color/gray_medium
- - @drawable/ic_action_back_dark
- @color/gray_dark
- @color/black
- @color/gray_medium
+ - @drawable/ic_action_back_dark
- @drawable/ic_action_forward_dark
- @style/overFlowButtonStyle
@@ -71,12 +70,5 @@
- sans-serif-light
-
-
-
\ No newline at end of file
diff --git a/src/acr/browser/lightning/BrowserActivity.java b/src/acr/browser/lightning/BrowserActivity.java
index c84bbb0..9ffc976 100644
--- a/src/acr/browser/lightning/BrowserActivity.java
+++ b/src/acr/browser/lightning/BrowserActivity.java
@@ -136,6 +136,7 @@ public class BrowserActivity extends ActionBarActivity implements BrowserControl
initialize();
}
+ @SuppressLint("NewApi")
@SuppressWarnings("deprecation")
private synchronized void initialize() {
setContentView(R.layout.activity_main);
@@ -1439,6 +1440,7 @@ public class BrowserActivity extends ActionBarActivity implements BrowserControl
Utils.trimCache(this);
}
+ @SuppressLint("NewApi")
@SuppressWarnings("deprecation")
public void clearCookies() {
CookieManager c = CookieManager.getInstance();
diff --git a/src/acr/browser/lightning/SearchAdapter.java b/src/acr/browser/lightning/SearchAdapter.java
index 62dde31..d8f9334 100644
--- a/src/acr/browser/lightning/SearchAdapter.java
+++ b/src/acr/browser/lightning/SearchAdapter.java
@@ -18,13 +18,16 @@ import java.util.Locale;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserFactory;
+import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.SharedPreferences;
+import android.content.res.Resources.Theme;
import android.graphics.Color;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.AsyncTask;
+import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -53,9 +56,12 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
private XmlPullParserFactory mFactory;
private XmlPullParser mXpp;
private String mSearchSubtitle;
+ private static final int API = Build.VERSION.SDK_INT;
+ private Theme mTheme;
public SearchAdapter(Context context, boolean incognito) {
mDatabaseHandler = HistoryDatabase.getInstance(context);
+ mTheme = context.getTheme();
mFilteredList = new ArrayList();
mHistory = new ArrayList();
mBookmarks = new ArrayList();
@@ -131,6 +137,8 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
return 0;
}
+ @SuppressWarnings("deprecation")
+ @SuppressLint("NewApi")
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View row = convertView;
@@ -184,7 +192,11 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
}
}
- holder.mImage.setImageDrawable(mContext.getResources().getDrawable(imageId));
+ if (API < Build.VERSION_CODES.LOLLIPOP) {
+ holder.mImage.setImageDrawable(mContext.getResources().getDrawable(imageId));
+ } else {
+ holder.mImage.setImageDrawable(mContext.getResources().getDrawable(imageId, mTheme));
+ }
return row;
}
@@ -193,6 +205,8 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
if (mFilteredList != null) {
mFilteredList.clear();
mFilteredList.addAll(list);
+ } else {
+ mFilteredList = list;
}
notifyDataSetChanged();
}
@@ -321,12 +335,9 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
@Override
protected void onPostExecute(List result) {
- synchronized (mFilteredList) {
- mSuggestions = result;
-
- mFilteredList = getSuggestions();
- notifyDataSetChanged();
- }
+ mSuggestions = result;
+ mFilteredList = getSuggestions();
+ notifyDataSetChanged();
mIsExecuting = false;
}