Changeset ef67954 in orbit for android/src

Timestamp:

12/16/13 16:49:36 (8 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

9201730

Parents:

baab323

Message:

• Moved Emotiv fragment to internal repository pending permission from Emotiv

Location:

android/src/info/puzzlebox/orbit

Files:

• FragmentTabFlightEmotiv.java (deleted)
• OrbitTabActivity.java (modified) (3 diffs)

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

@@ -242 +242 @@
                                         FragmentTabFlightThinkGear.class, null);
                 }
-                else if (eegDevice == "Emotiv") {
-                        mTabsAdapter.addTab(mTabHost.newTabSpec("Orbit").setIndicator(tabFlightLabel),
-                                        FragmentTabFlightEmotiv.class, null);
-                }
+                //              else if (eegDevice == "Emotiv") {
+                //                      mTabsAdapter.addTab(mTabHost.newTabSpec("Orbit").setIndicator(tabFlightLabel),
+                //                                      FragmentTabFlightEmotiv.class, null);
+                //              }
 
                 mTabsAdapter.addTab(mTabHost.newTabSpec("Orbit").setIndicator(tabAdvancedLabel),
@@ -786 +786 @@
 
                 if (eegDevice == "ThinkGear") {
+                        
                         FragmentTabFlightThinkGear fragmentFlight = 
                                         (FragmentTabFlightThinkGear) getSupportFragmentManager().findFragmentByTag( getTabFragmentFlightThinkGear() );
@@ -791 +792 @@
                         if (fragmentFlight != null)
                                 eegPower = fragmentFlight.updatePower();
+                        
                 }
                 else if (eegDevice == "Emotiv") {
 
-                        FragmentTabFlightEmotiv fragmentFlight = 
-                                        (FragmentTabFlightEmotiv) getSupportFragmentManager().findFragmentByTag( getTabFragmentFlightEmotiv() );
-
-                        if (fragmentFlight != null)
-                                eegPower = fragmentFlight.updatePower();
+                        //                      FragmentTabFlightEmotiv fragmentFlight = 
+                        //                                      (FragmentTabFlightEmotiv) getSupportFragmentManager().findFragmentByTag( getTabFragmentFlightEmotiv() );
+                        //
+                        //                      if (fragmentFlight != null)
+                        //                              eegPower = fragmentFlight.updatePower();
 
                 }