diff --git a/android/assets/html/style.css b/android/assets/html/style.css
index 4a0e7a5e5..93f769ab7 100644
--- a/android/assets/html/style.css
+++ b/android/assets/html/style.css
@@ -1,12 +1,9 @@
body {
- background-color: black;
- color: white;
+ background-color: white;
+ color: black;
font-family: Arial sans-serif;
font-size: 14pt;
}
-a:link, a:visited, a:active {
- color: white;
-}
ul.touchable li {
padding-top:8px;
padding-bottom:8px;
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index 91279b6b6..1872d5b18 100755
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -31,8 +31,8 @@
#ffffffff
#ff000000
#ff4b4b4b
- #ffffffff
- #ff000000
+ #ff000000
+ #ffffffff
#50000000
#ffffffff
#00000000
diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java
index 2154a8871..61fd4bdd2 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivity.java
@@ -150,6 +150,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
private String characterSet;
private String versionName;
private HistoryManager historyManager;
+ private boolean firstLaunch;
private final OnCompletionListener beepListener = new BeepListener();
@@ -187,9 +188,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
historyManager = new HistoryManager(this);
historyManager.trimHistory();
- showHelpOnFirstLaunch();
-
- Toast.makeText(this, R.string.msg_default_status, Toast.LENGTH_LONG).show();
+ firstLaunch = showHelpOnFirstLaunch();
}
@Override
@@ -261,6 +260,10 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
vibrate = prefs.getBoolean(PreferencesActivity.KEY_VIBRATE, false);
copyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, true);
initBeepSound();
+
+ if (!firstLaunch) {
+ Toast.makeText(this, R.string.msg_default_status, Toast.LENGTH_SHORT).show();
+ }
}
private static Vector parseDecodeFormats(Intent intent) {
@@ -521,8 +524,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
TextView contentsTextView = (TextView) findViewById(R.id.contents_text_view);
CharSequence displayContents = resultHandler.getDisplayContents();
contentsTextView.setText(displayContents);
- // Crudely scale betweeen 22 and 48 -- bigger font for shorter text
- int scaledSize = Math.max(22, 48 - displayContents.length() / 4);
+ // Crudely scale betweeen 22 and 42 -- bigger font for shorter text
+ int scaledSize = Math.max(22, 42 - displayContents.length() / 4);
contentsTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, scaledSize);
int buttonCount = resultHandler.getButtonCount();