a

diff --git a/workspace/TrainDelayed/bin/TrainDelayed.apk b/workspace/TrainDelayed/bin/TrainDelayed.apk
index 00519f9..64b64f6 100644 (file)
Binary files a/workspace/TrainDelayed/bin/TrainDelayed.apk and b/workspace/TrainDelayed/bin/TrainDelayed.apk differ

diff --git a/workspace/TrainDelayed/bin/classes.dex b/workspace/TrainDelayed/bin/classes.dex
index d220103..2cfa391 100644 (file)
Binary files a/workspace/TrainDelayed/bin/classes.dex and b/workspace/TrainDelayed/bin/classes.dex differ

diff --git a/workspace/TrainDelayed/bin/resources.ap_ b/workspace/TrainDelayed/bin/resources.ap_
index 893687f..57f5d7c 100644 (file)
Binary files a/workspace/TrainDelayed/bin/resources.ap_ and b/workspace/TrainDelayed/bin/resources.ap_ differ

diff --git a/workspace/TrainDelayed/gen/com/td/R.java b/workspace/TrainDelayed/gen/com/td/R.java
index 627f194..7a99fb7 100644 (file)
--- a/workspace/TrainDelayed/gen/com/td/R.java
+++ b/workspace/TrainDelayed/gen/com/td/R.java
@@ -16,67 +16,68 @@ public final class R {
         public static final int on=0x7f020002;\r
     }\r
     public static final class id {\r
-        public static final int LinearLayout01=0x7f05000d;\r
-        public static final int LinearLayout02=0x7f050011;\r
-        public static final int LinearLayout03=0x7f050013;\r
-        public static final int LinearLayout04=0x7f050015;\r
-        public static final int LinearLayout05=0x7f050017;\r
-        public static final int LinearLayout06=0x7f050019;\r
-        public static final int LinearLayout07=0x7f05001b;\r
-        public static final int LinearLayout09=0x7f05001d;\r
-        public static final int LinearLayout64=0x7f05002a;\r
-        public static final int LinearLayout74=0x7f05000a;\r
-        public static final int button01=0x7f050010;\r
-        public static final int button02=0x7f050012;\r
-        public static final int button03=0x7f050014;\r
-        public static final int button04=0x7f050016;\r
-        public static final int button05=0x7f050018;\r
-        public static final int button06=0x7f05001a;\r
-        public static final int button07=0x7f05001c;\r
-        public static final int button09=0x7f05001e;\r
-        public static final int button11=0x7f050004;\r
-        public static final int button12=0x7f050005;\r
-        public static final int button51=0x7f05003b;\r
-        public static final int button61=0x7f05002b;\r
-        public static final int button62=0x7f05002c;\r
-        public static final int button63=0x7f05002d;\r
-        public static final int button64=0x7f05002e;\r
-        public static final int button65=0x7f05002f;\r
-        public static final int button66=0x7f050030;\r
-        public static final int button71=0x7f05000b;\r
-        public static final int button72=0x7f05000c;\r
-        public static final int button81=0x7f050034;\r
-        public static final int button82=0x7f050035;\r
-        public static final int button83=0x7f050036;\r
-        public static final int button84=0x7f050037;\r
-        public static final int button85=0x7f050038;\r
-        public static final int button86=0x7f050039;\r
+        public static final int LinearLayout01=0x7f05000e;\r
+        public static final int LinearLayout02=0x7f050012;\r
+        public static final int LinearLayout03=0x7f050014;\r
+        public static final int LinearLayout04=0x7f050016;\r
+        public static final int LinearLayout05=0x7f050018;\r
+        public static final int LinearLayout06=0x7f05001a;\r
+        public static final int LinearLayout07=0x7f05001c;\r
+        public static final int LinearLayout09=0x7f05001e;\r
+        public static final int LinearLayout64=0x7f05002b;\r
+        public static final int LinearLayout74=0x7f05000b;\r
+        public static final int button01=0x7f050011;\r
+        public static final int button02=0x7f050013;\r
+        public static final int button03=0x7f050015;\r
+        public static final int button04=0x7f050017;\r
+        public static final int button05=0x7f050019;\r
+        public static final int button06=0x7f05001b;\r
+        public static final int button07=0x7f05001d;\r
+        public static final int button09=0x7f05001f;\r
+        public static final int button11=0x7f050005;\r
+        public static final int button12=0x7f050006;\r
+        public static final int button51=0x7f05003c;\r
+        public static final int button61=0x7f05002c;\r
+        public static final int button62=0x7f05002d;\r
+        public static final int button63=0x7f05002e;\r
+        public static final int button64=0x7f05002f;\r
+        public static final int button65=0x7f050030;\r
+        public static final int button66=0x7f050031;\r
+        public static final int button71=0x7f05000c;\r
+        public static final int button72=0x7f05000d;\r
+        public static final int button81=0x7f050035;\r
+        public static final int button82=0x7f050036;\r
+        public static final int button83=0x7f050037;\r
+        public static final int button84=0x7f050038;\r
+        public static final int button85=0x7f050039;\r
+        public static final int button86=0x7f05003a;\r
         public static final int checkBox=0x7f050000;\r
-        public static final int checkBox61=0x7f050021;\r
-        public static final int checkBox62=0x7f050022;\r
-        public static final int checkBox63=0x7f050023;\r
-        public static final int checkBox64=0x7f050024;\r
-        public static final int checkBox65=0x7f050025;\r
-        public static final int checkBox66=0x7f050026;\r
-        public static final int checkBox67=0x7f050027;\r
-        public static final int editText81=0x7f050033;\r
-        public static final int imageView1=0x7f05003c;\r
-        public static final int listView61=0x7f05001f;\r
-        public static final int listView81=0x7f050032;\r
-        public static final int menu51=0x7f05003a;\r
-        public static final int scrollView01=0x7f05000f;\r
-        public static final int scrollView61=0x7f050020;\r
-        public static final int spcv=0x7f050003;\r
-        public static final int spinner71=0x7f050006;\r
-        public static final int spinner72=0x7f050007;\r
+        public static final int checkBox61=0x7f050022;\r
+        public static final int checkBox62=0x7f050023;\r
+        public static final int checkBox63=0x7f050024;\r
+        public static final int checkBox64=0x7f050025;\r
+        public static final int checkBox65=0x7f050026;\r
+        public static final int checkBox66=0x7f050027;\r
+        public static final int checkBox67=0x7f050028;\r
+        public static final int editText81=0x7f050034;\r
+        public static final int imageView1=0x7f05003d;\r
+        public static final int listView61=0x7f050020;\r
+        public static final int listView81=0x7f050033;\r
+        public static final int menu51=0x7f05003b;\r
+        public static final int scrollView01=0x7f050010;\r
+        public static final int scrollView11=0x7f050003;\r
+        public static final int scrollView61=0x7f050021;\r
+        public static final int spcv=0x7f050004;\r
+        public static final int spinner71=0x7f050007;\r
+        public static final int spinner72=0x7f050008;\r
         public static final int text2=0x7f050001;\r
-        public static final int textView01=0x7f05000e;\r
-        public static final int textView1=0x7f050031;\r
+        public static final int textView01=0x7f05000f;\r
+        public static final int textView1=0x7f050032;\r
         public static final int textView11=0x7f050002;\r
-        public static final int timePicker61=0x7f050028;\r
-        public static final int timePicker62=0x7f050029;\r
-        public static final int timePicker71=0x7f050008;\r
-        public static final int timePicker72=0x7f050009;\r
+        public static final int timePicker61=0x7f050029;\r
+        public static final int timePicker62=0x7f05002a;\r
+        public static final int timePicker71=0x7f050009;\r
+        public static final int timePicker72=0x7f05000a;\r
     }\r
     public static final class layout {\r
         public static final int check_list_item_1=0x7f030000;\r

diff --git a/workspace/TrainDelayed/res/layout/history.xml b/workspace/TrainDelayed/res/layout/history.xml
index 8a256bd..ea97e3d 100644 (file)
--- a/workspace/TrainDelayed/res/layout/history.xml
+++ b/workspace/TrainDelayed/res/layout/history.xml
@@ -5,12 +5,14 @@
     android:layout_height="fill_parent"
     >
 <TextView android:text="20xx/00/00 00:00 - 00:00" android:id="@+id/textView11" android:background="#999999" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+<HorizontalScrollView android:id="@+id/scrollView11" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="10">
     <com.td.HistoryView
               android:id="@+id/spcv"
               android:layout_margin="0dip"
-              android:layout_weight="10"
+              android:layout_weight="1"
               android:layout_width="fill_parent"
-              android:layout_height="wrap_content" />
+              android:layout_height="fill_parent" />
+</HorizontalScrollView>
        <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
                <Button android:text="設定" android:layout_weight="1" android:id="@+id/button11" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
                <Button android:text="戻る" android:layout_weight="1" android:id="@+id/button12" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 

diff --git a/workspace/TrainDelayed/src/com/td/HistoryActivity.java b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
index 3e161ea..9870063 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/HistoryActivity.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryActivity.java
@@ -11,10 +11,12 @@ import org.afree.data.category.DefaultCategoryDataset;
 \r
 import android.content.Context;\r
 import android.content.Intent;\r
+import android.content.res.Configuration;\r
 import android.os.Bundle;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.widget.Button;\r
+import android.widget.HorizontalScrollView;\r
 import android.widget.TextView;\r
 \r
 import com.td.db.History;\r
@@ -41,7 +43,10 @@ public class HistoryActivity extends BaseActivity {
 \r
        private TextView textView1;\r
        private EditPrefUtil pref = new EditPrefUtil(this);\r
-\r
+    private HorizontalScrollView scrollView;\r
+    Button bb;\r
+    HistoryView spcv;\r
+    \r
        private int prefYear;\r
        private int prefMonth;\r
        private int prefDay;\r
@@ -78,7 +83,9 @@ public class HistoryActivity extends BaseActivity {
                        });\r
 \r
                        textView1 = (TextView) findViewById(R.id.textView11);\r
-                       \r
+                       scrollView = (HorizontalScrollView) findViewById(R.id.scrollView11);\r
+                       bb = button1;\r
+                       spcv = (HistoryView) findViewById(R.id.spcv);\r
 //                     HistoryDao dao = HistoryDao.getInstance();\r
 //                     // List<History> list = dao.search(this);\r
 //                     Calendar cal = Calendar.getInstance();\r
@@ -126,7 +133,31 @@ public class HistoryActivity extends BaseActivity {
                }\r
        }\r
 \r
+\r
        @Override\r
+       public void onWindowFocusChanged(boolean hasFocus) {\r
+               int width = scrollView.getWidth();\r
+               int height = scrollView.getHeight();\r
+               \r
+               spcv.setMinimumWidth(width);\r
+               spcv.setMinimumWidth(height);\r
+\r
+               width = spcv.getWidth();\r
+               height = spcv.getHeight();\r
+               \r
+               // TODO Auto-generated method stub\r
+               super.onWindowFocusChanged(hasFocus);\r
+       }\r
+       \r
+       @Override\r
+    public void onConfigurationChanged(Configuration newConfig ) {\r
+               int width = scrollView.getWidth();\r
+               int height = scrollView.getHeight();\r
+               \r
+        super.onConfigurationChanged(newConfig);\r
+    }\r
+        \r
+    @Override\r
        protected void onStart() {\r
                super.onStart();\r
 \r
@@ -244,4 +275,5 @@ public class HistoryActivity extends BaseActivity {
 \r
                pref.update();\r
        }\r
+\r
 }\r

diff --git a/workspace/TrainDelayed/src/com/td/HistoryView.java b/workspace/TrainDelayed/src/com/td/HistoryView.java
index 2bcb7dc..14ca31e 100644 (file)
--- a/workspace/TrainDelayed/src/com/td/HistoryView.java
+++ b/workspace/TrainDelayed/src/com/td/HistoryView.java
@@ -7,10 +7,11 @@ import android.content.Context;
 import android.graphics.Canvas;\r
 import android.util.AttributeSet;\r
 import android.view.View;\r
+import android.widget.HorizontalScrollView;\r
 \r
 public class HistoryView extends View {\r
     private AFreeChart chart;\r
-\r
+    \r
     public HistoryView(Context context, AttributeSet attrs) {\r
         super(context, attrs);\r
     }\r
@@ -29,6 +30,7 @@ public class HistoryView extends View {
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {\r
        setMeasuredDimension(measureWidth(widthMeasureSpec),\r
                                measureHeight(heightMeasureSpec));\r
+//     setMeasuredDimension(1000, 300);\r
     }\r
 \r
     private int measureWidth(int measureSpec) {\r