diff --git a/res/drawable-hdpi/action_search.png b/res/drawable-hdpi/action_search.png
deleted file mode 100644
index f12e005..0000000
Binary files a/res/drawable-hdpi/action_search.png and /dev/null differ
diff --git a/res/drawable-mdpi/action_search.png b/res/drawable-mdpi/action_search.png
deleted file mode 100644
index 587d9e0..0000000
Binary files a/res/drawable-mdpi/action_search.png and /dev/null differ
diff --git a/res/drawable-xhdpi/action_search.png b/res/drawable-xhdpi/action_search.png
deleted file mode 100644
index 3549f84..0000000
Binary files a/res/drawable-xhdpi/action_search.png and /dev/null differ
diff --git a/res/drawable-xhdpi/edit_text_bg.9.png b/res/drawable-xhdpi/edit_text_bg.9.png
deleted file mode 100644
index 92c9b21..0000000
Binary files a/res/drawable-xhdpi/edit_text_bg.9.png and /dev/null differ
diff --git a/res/layout-large/activity_main.xml b/res/layout-large/activity_main.xml
index 86112c7..39d6102 100644
--- a/res/layout-large/activity_main.xml
+++ b/res/layout-large/activity_main.xml
@@ -5,7 +5,6 @@
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/gray_medium"
android:orientation="vertical" >
@@ -161,7 +160,7 @@
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_gravity="end"
- android:background="#e4e4e4"
+ android:background="@color/drawer_background"
android:clickable="true"
android:orientation="vertical" >
diff --git a/res/layout-xlarge/activity_main.xml b/res/layout-xlarge/activity_main.xml
index 86112c7..39d6102 100644
--- a/res/layout-xlarge/activity_main.xml
+++ b/res/layout-xlarge/activity_main.xml
@@ -5,7 +5,6 @@
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/gray_medium"
android:orientation="vertical" >
@@ -161,7 +160,7 @@
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_gravity="end"
- android:background="#e4e4e4"
+ android:background="@color/drawer_background"
android:clickable="true"
android:orientation="vertical" >
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 04a4dce..b0b8c66 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -5,7 +5,6 @@
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/gray_medium"
android:orientation="vertical" >
@@ -161,7 +160,7 @@
android:layout_width="240dp"
android:layout_height="match_parent"
android:layout_gravity="end"
- android:background="#e4e4e4"
+ android:background="@color/drawer_background"
android:clickable="true"
android:orientation="vertical" >
diff --git a/res/layout/advanced_settings.xml b/res/layout/advanced_settings.xml
index b6050de..76194e4 100644
--- a/res/layout/advanced_settings.xml
+++ b/res/layout/advanced_settings.xml
@@ -1,589 +1,499 @@
-
+ android:layout_height="match_parent" >
-
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="60dp"
+ android:background="?android:attr/listChoiceBackgroundIndicator"
+ android:paddingRight="10dp" >
-
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:orientation="vertical" >
-
-
+ android:paddingLeft="10dp"
+ android:text="@string/recommended"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/light" />
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:orientation="vertical" >
-
-
+ android:paddingLeft="10dp"
+ android:text="@string/recommended"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/light" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:orientation="vertical" >
-
-
+ android:paddingLeft="10dp"
+ android:text="@string/recommended"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/light" />
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:orientation="vertical" >
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:paddingLeft="10dp"
+ android:text="@string/cookies"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:paddingLeft="10dp"
+ android:text="@string/recommended"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/light" />
+
+
+
+
+
+
+
+
-
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:orientation="vertical" >
+
-
-
+
+
+
+
+
+
-
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:orientation="vertical" >
-
-
+ android:paddingLeft="10dp"
+ android:text="@string/recommended"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/light" />
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:orientation="vertical" >
-
-
-
-
-
-
+ android:text="@string/recommended"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/light" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:orientation="vertical" >
-
-
-
-
-
-
-
-
-
-
-
-
+ android:paddingLeft="10dp"
+ android:text="@string/powered_by_google"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/light" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ 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/values-de/strings.xml b/res/values-de/strings.xml
index 89964ef..f51773a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -19,7 +19,7 @@
Lightning
Navigation-Drawer öffnen
- Navigation-Drawer schliessen
+ Navigation-Drawer schließen
Websuche
Aktualisieren
Neuer Tab
@@ -145,7 +145,7 @@
Open Source-Lizenzen
Suche nach
Werbung blockieren
- Das Zertifikat dieser Webseite ist nicht vertrauenswürdig. Trozdem fortsetzen?
+ Das Zertifikat dieser Webseite ist nicht vertrauenswürdig. Trotzdem fortsetzen?
Formularneuzustellung
Daten erneut senden?
\nMeine Position verwenden?
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 44f01db..0000000
--- a/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index 61e3fa8..0000000
--- a/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- 128dp
-
-
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f6f9cda..6563ad7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,15 +1,13 @@
- #00000000
- #b433b5e5
- #3333b5e5
+
+ #e4e4e4
#ff000000
- #ff3f3f3f
#ffa0a0a0
#222222
#dddddd
#cdcdcd
#ffffff
#1b1b1b
-
+
\ No newline at end of file
diff --git a/src/acr/browser/lightning/BrowserActivity.java b/src/acr/browser/lightning/BrowserActivity.java
index 06865d8..8c12e2b 100644
--- a/src/acr/browser/lightning/BrowserActivity.java
+++ b/src/acr/browser/lightning/BrowserActivity.java
@@ -422,12 +422,6 @@ public class BrowserActivity extends Activity implements BrowserController {
}
}
- @Override
- public void onDrawerSlide(View drawerView, float slideOffset) {
- super.onDrawerSlide(drawerView, slideOffset);
-
- }
-
};
mNewTab.setOnClickListener(new OnClickListener() {
@@ -456,18 +450,15 @@ public class BrowserActivity extends Activity implements BrowserController {
else
checkForTor();
-
}
/*
* If Orbot/Tor is installed, prompt the user if they want to enable proxying for this session
*/
- public boolean checkForTor ()
- {
+ public boolean checkForTor () {
OrbotHelper oh = new OrbotHelper(this);
- if (oh.isOrbotInstalled())
- {
+ if (oh.isOrbotInstalled()) {
DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@@ -501,8 +492,7 @@ public class BrowserActivity extends Activity implements BrowserController {
/*
* Initialize WebKit Proxying for Tor
*/
- public void initializeTor ()
- {
+ public void initializeTor() {
OrbotHelper oh = new OrbotHelper(this);
if (!oh.isOrbotRunning())
@@ -539,7 +529,7 @@ public class BrowserActivity extends Activity implements BrowserController {
String mem = mPreferences.getString(PreferenceConstants.URL_MEMORY,
"");
mEditPrefs.putString(PreferenceConstants.URL_MEMORY, "");
- String[] array = getArray(mem);
+ String[] array = Utils.getArray(mem);
int count = 0;
for (int n = 0; n < array.length; n++) {
if (array[n].length() > 0) {
@@ -558,10 +548,6 @@ public class BrowserActivity extends Activity implements BrowserController {
}
- public static String[] getArray(String input) {
- return input.split("\\|\\$\\|SEPARATOR\\|\\$\\|");
- }
-
public void initializePreferences() {
if (mPreferences == null) {
mPreferences = getSharedPreferences(
@@ -640,15 +626,6 @@ public class BrowserActivity extends Activity implements BrowserController {
return super.onCreateOptionsMenu(menu);
}
- /* Called whenever we call invalidateOptionsMenu() */
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- // If the nav drawer is open, hide action items related to the content
- // view
-
- return super.onPrepareOptionsMenu(menu);
- }
-
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// The action bar home/up action should open or close the drawer.
@@ -1190,30 +1167,6 @@ public class BrowserActivity extends Activity implements BrowserController {
super.onDestroy();
}
- @Override
- protected void onPostResume() {
- Log.i("Lightning", "onPostResume");
- super.onPostResume();
- }
-
- @Override
- protected void onRestart() {
- Log.i("Lightning", "onRestart");
- super.onRestart();
- }
-
- @Override
- protected void onStart() {
- Log.i("Lightning", "onStart");
- super.onStart();
- }
-
- @Override
- protected void onStop() {
- Log.i("Lightning", "onStop");
- super.onStop();
- }
-
@Override
protected void onResume() {
super.onResume();
diff --git a/src/acr/browser/lightning/IncognitoActivity.java b/src/acr/browser/lightning/IncognitoActivity.java
index 59aee64..4af0136 100644
--- a/src/acr/browser/lightning/IncognitoActivity.java
+++ b/src/acr/browser/lightning/IncognitoActivity.java
@@ -417,12 +417,6 @@ public class IncognitoActivity extends Activity implements BrowserController {
}
}
- @Override
- public void onDrawerSlide(View drawerView, float slideOffset) {
- super.onDrawerSlide(drawerView, slideOffset);
-
- }
-
};
mNewTab.setOnClickListener(new OnClickListener() {
@@ -454,10 +448,6 @@ public class IncognitoActivity extends Activity implements BrowserController {
}
- public static String[] getArray(String input) {
- return input.split("\\|\\$\\|SEPARATOR\\|\\$\\|");
- }
-
public void initializePreferences() {
if (mPreferences == null) {
mPreferences = getSharedPreferences(
@@ -536,15 +526,6 @@ public class IncognitoActivity extends Activity implements BrowserController {
return super.onCreateOptionsMenu(menu);
}
- /* Called whenever we call invalidateOptionsMenu() */
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- // If the nav drawer is open, hide action items related to the content
- // view
-
- return super.onPrepareOptionsMenu(menu);
- }
-
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// The action bar home/up action should open or close the drawer.
@@ -1071,30 +1052,6 @@ public class IncognitoActivity extends Activity implements BrowserController {
super.onDestroy();
}
- @Override
- protected void onPostResume() {
- Log.i("Lightning", "onPostResume");
- super.onPostResume();
- }
-
- @Override
- protected void onRestart() {
- Log.i("Lightning", "onRestart");
- super.onRestart();
- }
-
- @Override
- protected void onStart() {
- Log.i("Lightning", "onStart");
- super.onStart();
- }
-
- @Override
- protected void onStop() {
- Log.i("Lightning", "onStop");
- super.onStop();
- }
-
@Override
protected void onResume() {
super.onResume();
diff --git a/src/acr/browser/lightning/Utils.java b/src/acr/browser/lightning/Utils.java
index 91a03fb..c7e6735 100644
--- a/src/acr/browser/lightning/Utils.java
+++ b/src/acr/browser/lightning/Utils.java
@@ -26,10 +26,6 @@ import android.widget.Toast;
public class Utils {
- public Utils() {
- // TODO Auto-generated constructor stub
- }
-
public static void downloadFile(final Activity activity, final String url, final String userAgent, final String contentDisposition, final boolean privateBrowsing){
String fileName = URLUtil.guessFileName(url, null,
null);
@@ -146,4 +142,8 @@ public class Utils {
}
return bookmarks;
}
+
+ public static String[] getArray(String input) {
+ return input.split("\\|\\$\\|SEPARATOR\\|\\$\\|");
+ }
}