Browse Source

Bugfixes

HOLOYOLO Praise Matias!!!

- fixed a problem with the wide viewport preference not being saved
correctly... also added a sort of easter egg.
master
Anthony Restaino 11 years ago
parent
commit
3df9b852fa
  1. 4
      AndroidManifest.xml
  2. 2
      src/acr/browser/barebones/activities/AdvancedSettingsActivity.java
  3. 2
      src/acr/browser/barebones/activities/BarebonesActivity.java
  4. 2
      src/acr/browser/barebones/activities/IncognitoModeActivity.java
  5. 15
      src/acr/browser/barebones/activities/SettingsActivity.java

4
AndroidManifest.xml

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="acr.browser.barebones" package="acr.browser.barebones"
android:versionCode="45" android:versionCode="46"
android:versionName="2.5.0.4" > android:versionName="2.5.0.5" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"

2
src/acr/browser/barebones/activities/AdvancedSettingsActivity.java

@ -36,8 +36,6 @@ import android.widget.Toast;
public class AdvancedSettingsActivity extends Activity { public class AdvancedSettingsActivity extends Activity {
// settings variables // settings variables
static boolean savePasswords, clearCache, enableJavaScript,
enableTextReflow, blockImages, newWindow, incognitoAlways;
static int defaultZoom, textSize; static int defaultZoom, textSize;
static final int API = FinalVariables.API; static final int API = FinalVariables.API;
static final String preferences = "settings"; static final String preferences = "settings";

2
src/acr/browser/barebones/activities/BarebonesActivity.java

@ -497,7 +497,7 @@ public class BarebonesActivity extends Activity {
if (url.startsWith("file:///")) { if (url.startsWith("file:///")) {
view.getSettings().setUseWideViewPort(false); view.getSettings().setUseWideViewPort(false);
} else { } else {
view.getSettings().setUseWideViewPort(true); view.getSettings().setUseWideViewPort(settings.getBoolean("wideviewport", true));
} }
if (view.isShown()) { if (view.isShown()) {

2
src/acr/browser/barebones/activities/IncognitoModeActivity.java

@ -494,7 +494,7 @@ public class IncognitoModeActivity extends Activity {
if (url.startsWith("file:///")) { if (url.startsWith("file:///")) {
view.getSettings().setUseWideViewPort(false); view.getSettings().setUseWideViewPort(false);
} else { } else {
view.getSettings().setUseWideViewPort(true); view.getSettings().setUseWideViewPort(settings.getBoolean("wideviewport", true));
} }
if (view.isShown()) { if (view.isShown()) {

15
src/acr/browser/barebones/activities/SettingsActivity.java

@ -105,12 +105,12 @@ public class SettingsActivity extends Activity {
download.setText(downloadLocation); download.setText(downloadLocation);
int code = 0; String code = "HOLO";
try { try {
PackageInfo p = getPackageManager().getPackageInfo( PackageInfo p = getPackageManager().getPackageInfo(
getPackageName(), 0); getPackageName(), 0);
code = p.versionCode; code = p.versionName;
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
@ -323,15 +323,12 @@ public class SettingsActivity extends Activity {
public void onClick(View v) { public void onClick(View v) {
egg++; egg++;
if (egg == 10) { if (egg == 10) {
Toast.makeText(SettingsActivity.this, "Almost There", startActivity(new Intent(
Toast.LENGTH_SHORT).show(); Intent.ACTION_VIEW,
} Uri.parse("http://imgs.xkcd.com/comics/compiling.png")));
if (egg == 15) { finish();
Toast.makeText(SettingsActivity.this,
"Easter Egg goes here", Toast.LENGTH_SHORT).show();
egg = 0; egg = 0;
} }
} }
}); });

Loading…
Cancel
Save