Browse files

minor fixes

  • Loading branch information...
1 parent dabfcb5 commit bbd508ec91c61e6e551b565af446250e383b9bb9 @mdykman committed Dec 19, 2012
Showing with 14 additions and 14 deletions.
  1. +2 −2 jni/Android.mk
  2. +9 −9 res/xml/num.xml
  3. +1 −1 src/org/dykman/j/android/JActivity.java
  4. +2 −2 src/org/dykman/jn/Glcmds.java
View
4 jni/Android.mk
@@ -14,9 +14,9 @@ LOCAL_PATH:=(call my-dir)
TARGET_PLATFORM := android-7
-#include jni/openj-core/Android.mk
+include jni/openj-core/Android.mk
# bill is alternative, termporarily to openj-core
-include jni/bill/Android.mk
+#include jni/bill/Android.mk
# include jni/libm/Android.mk
#include jni/openj-core/Jconsole.mk
View
18 res/xml/num.xml
@@ -23,21 +23,21 @@
<Row>
<Key android:codes="99" android:keyLabel="c" android:keyEdgeFlags="left"/>
<Key android:codes="100" android:keyLabel="d" />
- <Key android:codes="52" android:keyWidth="13%p" android:keyLabel="4"/>
- <Key android:codes="53" android:keyWidth="14%p" android:keyLabel="5"/>
- <Key android:codes="54" android:keyWidth="13%p" android:keyLabel="6"/>
+ <Key android:codes="52" android:keyWidth="13.3%p" android:keyLabel="4"/>
+ <Key android:codes="53" android:keyWidth="13.4%p" android:keyLabel="5"/>
+ <Key android:codes="54" android:keyWidth="13.3%p" android:keyLabel="6"/>
<Key android:codes="43" android:keyLabel="+" />
<Key android:codes="120" android:keyLabel="x"/>
<Key android:codes="121" android:keyLabel="y" />
<Key android:codes="-1151" android:keyLabel="ad" android:keyEdgeFlags="right"/>
</Row>
-
+
<Row>
<Key android:codes="101" android:keyLabel="e" android:keyEdgeFlags="left"/>
<Key android:codes="102" android:keyLabel="f" />
- <Key android:codes="55" android:keyWidth="13%p" android:keyLabel="7"/>
- <Key android:codes="56" android:keyWidth="14%p" android:keyLabel="8"/>
- <Key android:codes="57" android:keyWidth="13%p" android:keyLabel="9"/>
+ <Key android:codes="55" android:keyWidth="13.3%p" android:keyLabel="7"/>
+ <Key android:codes="56" android:keyWidth="13.4%p" android:keyLabel="8"/>
+ <Key android:codes="57" android:keyWidth="13.3%p" android:keyLabel="9"/>
<Key android:codes="106" android:keyLabel="j" />
<Key android:codes="112" android:keyLabel="p" />
<Key android:codes="114" android:keyLabel="r" />
@@ -47,8 +47,8 @@
<Row android:rowEdgeFlags="bottom" >
<Key android:codes="-1001" android:keyLabel="..." android:keyWidth="13%p" android:keyEdgeFlags="left"/>
<Key android:codes="-1004" android:keyLabel="abc" android:keyWidth="12%p" />
- <Key android:codes="48" android:keyWidth="10%p" android:keyLabel="0"/>
- <Key android:codes="32" android:keyWidth="20%p" android:keyIcon="@drawable/sym_keyboard_space"/>
+ <Key android:codes="48" android:keyWidth="13.4%p" android:keyLabel="0"/>
+ <Key android:codes="32" android:keyWidth="16.6%p" android:keyIcon="@drawable/sym_keyboard_space"/>
<Key android:codes="61" android:keyLabel="="/>
<Key android:codes="46" android:keyWidth="10%p" android:keyLabel="."/>
<Key android:codes="58" android:keyWidth="10%p" android:keyLabel=":"/>
View
2 src/org/dykman/j/android/JActivity.java
@@ -113,7 +113,7 @@ public void setjtimer(int i, int time, String verb) {
if (i > 10 || i < 0) return;
timerHandler[i].removeCallbacks(timerTask[i]);
timerInterval[i] = Math.max (0l, (long)time);
- if (verb != null && !verb.isEmpty() && !verb.trim().isEmpty()) timerVerb[i] = verb;
+ if (verb != null && verb.length() > 0 && verb.trim().length() > 0) timerVerb[i] = verb;
if (timerVerb[i] != null && (timerInterval[i] > 0))
timerHandler[i].postDelayed(timerTask[i], timerInterval[i]);
}
View
4 src/org/dykman/jn/Glcmds.java
@@ -171,7 +171,7 @@ public int glcmds ( Canvas canvas, Paint paint, Path path, int[] ipar, String fo
java.lang.String[] ss1 = textstring.split(" ");
size = Float.parseFloat(ss1[0]);
if (ss1.length>1) {
- for (j = 1; j < ss1.length; j++) {
+ for (int j = 1; j < ss1.length; j++) {
if (ss1[j].equals("bold")) bold = 1;
else if (ss1[j].equals("italic")) italic = 1;
else if (ss1[j].equals("underline")) andunderline = 1;
@@ -183,7 +183,7 @@ public int glcmds ( Canvas canvas, Paint paint, Path path, int[] ipar, String fo
if (ss.length>1) {
size = Float.parseFloat(ss[1]);
if (ss.length>2) {
- for (j = 2; j < ss.length; j++) {
+ for (int j = 2; j < ss.length; j++) {
if (ss[j].equals("bold")) bold = 1;
else if (ss[j].equals("italic")) italic = 1;
else if (ss[j].equals("underline")) andunderline = 1;

0 comments on commit bbd508e

Please sign in to comment.