Updated Android App
authorTonyCave <t-cave@ti.com>
Tue, 10 Dec 2013 22:22:11 +0000 (22:22 +0000)
committerTonyCave <t-cave@ti.com>
Tue, 10 Dec 2013 22:22:11 +0000 (22:22 +0000)
17 files changed:
client/AndroidClients/LightingController/.classpath
client/AndroidClients/LightingController/.project
client/AndroidClients/LightingController/AndroidManifest.xml
client/AndroidClients/LightingController/bin/AndroidManifest.xml
client/AndroidClients/LightingController/bin/LightingController.apk
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/R$drawable.class
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$3.class
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$4.class
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$5.class
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask$1.class
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask.class
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$waitRspTask.class
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain.class
client/AndroidClients/LightingController/gen/com/lightingcontroller/R.java
client/AndroidClients/LightingController/res/drawable-hdpi/zllapplogo.png [new file with mode: 0644]
client/AndroidClients/LightingController/res/values/strings.xml
client/AndroidClients/LightingController/src/com/lightingcontroller/zllMain.java

index ce3da4842854e26aa22b99fb810c2d7417e71477..f9dcfda1bd659f9ac3dbbafb252aa457326ba67c 100755 (executable)
@@ -2,8 +2,8 @@
 <classpath>\r
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>\r
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>\r
+       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="src" path="gen"/>\r
-       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>\r
        <classpathentry kind="output" path="bin/classes"/>\r
 </classpath>\r
index bb70ac8b075b17d6db7b0c3db1acbc5ae045e6b3..7e9206a24918b2d4f64f28de461258cb6491f66f 100755 (executable)
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>LightingController</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>com.android.ide.eclipse.adt.ApkBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>LightingController</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>com.android.ide.eclipse.adt.ApkBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>com.android.ide.eclipse.adt.AndroidNature</nature>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+       </natures>\r
+</projectDescription>\r
index 45fb8cd37c791891a0e599dbb74796f31a4abbb4..c420eec81e91613e2f9a87e70f61678b2b491aea 100755 (executable)
@@ -15,7 +15,7 @@
                   android:anyDensity="true"/>
         
     <application
-        android:icon="@drawable/tizllicon"
+        android:icon="@drawable/zllapplogo"
         android:label="@string/app_name" >
         <activity
             android:label="@string/app_name"
index 45fb8cd37c791891a0e599dbb74796f31a4abbb4..c420eec81e91613e2f9a87e70f61678b2b491aea 100755 (executable)
@@ -15,7 +15,7 @@
                   android:anyDensity="true"/>
         
     <application
-        android:icon="@drawable/tizllicon"
+        android:icon="@drawable/zllapplogo"
         android:label="@string/app_name" >
         <activity
             android:label="@string/app_name"
index 69593ccf0b91632ae7b558fe7cb144b6c07f8c8f..013770db143010d2591b3d0a9a1ef1725f6d3a31 100644 (file)
Binary files a/client/AndroidClients/LightingController/bin/LightingController.apk and b/client/AndroidClients/LightingController/bin/LightingController.apk differ
index 8e6dc24f1419ab593299fc868286588e2d319dc6..02626beb060a59092df6c2c93295bcac0b32ba39 100755 (executable)
Binary files a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/R$drawable.class and b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/R$drawable.class differ
index ac2680743d31e01df53bf1fbcca6b991771d6080..f47e6eb10c06f09a12ea7bbfaf281fe3578ee819 100755 (executable)
Binary files a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$3.class and b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$3.class differ
index 6c88c017bdbbc0d67fbf4cf1450c854cfcb0214e..e1638a588e5384a88cdbe971481781da18c8bdb5 100755 (executable)
Binary files a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$4.class and b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$4.class differ
index c2bf6ed5dbf01115045f1eb57643275c4de5b33a..1d791b098ffd534fc3635a2ebb5003e135418511 100755 (executable)
Binary files a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$5.class and b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$5.class differ
index edcc6419d9b68901fa176fa2d28117a4dc5d7022..ab4c5834afa48c421feab13ca5c7886d268e9d27 100755 (executable)
Binary files a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask$1.class and b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask$1.class differ
index d46264302bbc22f9a2572e2bc27b928d38c152dc..dd0915ebad4d6c336afc24e4f88024d8131480d1 100755 (executable)
Binary files a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask.class and b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$addDeviceTask.class differ
index eff697ce76b953b19a148481665b77955b2aa52f..c168adf2d1bfd0c18dfddab16166a0894f519ef6 100755 (executable)
Binary files a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$waitRspTask.class and b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain$waitRspTask.class differ
index ab55b4189c9565def6a93546d09109e78a8d5c9f..a87bc2dc535b18a51ad6dac15ffa0d991cd63e51 100755 (executable)
Binary files a/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain.class and b/client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/zllMain.class differ
index 9e0e0d68e75c08045d3d2331a1e8eca81a2d194a..4ba2aa24a8283fac7a8b0cac1411265da25d04a6 100755 (executable)
@@ -37,7 +37,7 @@ public final class R {
         public static final int layoutborder=0x7f02000a;\r
         public static final int popup=0x7f02000b;\r
         public static final int tilogo=0x7f02000c;\r
-        public static final int tizllicon=0x7f02000d;\r
+        public static final int zllapplogo=0x7f02000d;\r
     }\r
     public static final class id {\r
         public static final int FrameLable03=0x7f080034;\r
diff --git a/client/AndroidClients/LightingController/res/drawable-hdpi/zllapplogo.png b/client/AndroidClients/LightingController/res/drawable-hdpi/zllapplogo.png
new file mode 100644 (file)
index 0000000..b6e34ed
Binary files /dev/null and b/client/AndroidClients/LightingController/res/drawable-hdpi/zllapplogo.png differ
index 4a3186b88fa3fddda894e9c7edcdb16a4a3d8029..b4f8083e10576b1ad037faa51bd8f33365f6ccfd 100755 (executable)
@@ -2,7 +2,7 @@
 <resources>
 
     <string name="hello">Hello World, UART_Jni!</string>
-    <string name="app_name">ZllRemote</string>
+    <string name="app_name">ZllController</string>
     <string-array name="OSC">
         <item>Internal OSC</item>>
         <item>External-16M</item>>
index adfcc12e065f01a28346fab5b84ce2cf69135cb3..2867d656f69975d1172567d580c1b1cd02a4c7f0 100755 (executable)
@@ -299,6 +299,7 @@ public class zllMain extends Activity {
             
             if (rspSuccess == false)
                {
+               /* take no action for now 
                AlertDialog show = new AlertDialog.Builder(zllMain.this)
                        .setTitle(param)
                        .setMessage("Device " + zllMain.currDevice.Name + " Not Responding.")
@@ -308,7 +309,7 @@ public class zllMain extends Activity {
                                public void onClick(DialogInterface dialoginterface,int i){                                     
                                }               
                        })                              
-                       .show();
+                       .show();*/
                }
             
         }