Changeset 89a4508 in orbit for android/src

Timestamp:

12/18/13 22:27:55 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

8ef81cf

Parents:

9b99f8e

Message:

• version 1.4.4 for Emotiv hand-over

File:

• android/src/info/puzzlebox/orbit/OrbitTabActivity.java (modified) (3 diffs)

android/src/info/puzzlebox/orbit/OrbitTabActivity.java

@@ -662 +662 @@
 
                 }
-                else if (eegDevice == "Emotiv") {
-                        //                      FragmentTabFlightEmotiv fragmentFlight = 
-                        //                                      (FragmentTabFlightEmotiv) getSupportFragmentManager().findFragmentByTag( getTabFragmentFlight() );
-                        //
-                        //                      if (fragmentFlight != null)
-                        //                              fragmentFlight.updateScreenLayoutSmall();
-                }
+                //              else if (eegDevice == "Emotiv") {
+                //                      FragmentTabFlightEmotiv fragmentFlight = 
+                //                                      (FragmentTabFlightEmotiv) getSupportFragmentManager().findFragmentByTag( getTabFragmentFlightEmotiv() );
+                //
+                //                      if (fragmentFlight != null)
+                //                              fragmentFlight.updateScreenLayoutSmall();
+                //              }
 
 
@@ -786 +786 @@
 
                 if (eegDevice == "ThinkGear") {
-                        
+
                         FragmentTabFlightThinkGear fragmentFlight = 
                                         (FragmentTabFlightThinkGear) getSupportFragmentManager().findFragmentByTag( getTabFragmentFlightThinkGear() );
@@ -792 +792 @@
                         if (fragmentFlight != null)
                                 eegPower = fragmentFlight.updatePower();
-                        
-                }
-                else if (eegDevice == "Emotiv") {
-
-                        //                      FragmentTabFlightEmotiv fragmentFlight = 
-                        //                                      (FragmentTabFlightEmotiv) getSupportFragmentManager().findFragmentByTag( getTabFragmentFlightEmotiv() );
-                        //
-                        //                      if (fragmentFlight != null)
-                        //                              eegPower = fragmentFlight.updatePower();
-
-                }
+
+                }
+                //              else if (eegDevice == "Emotiv") {
+                //
+                //                      FragmentTabFlightEmotiv fragmentFlight = 
+                //                                      (FragmentTabFlightEmotiv) getSupportFragmentManager().findFragmentByTag( getTabFragmentFlightEmotiv() );
+                //
+                //                      if (fragmentFlight != null)
+                //                              eegPower = fragmentFlight.updatePower();
+                //
+                //              }
 
                 String command = "";