Release: Removed Help, Tuning and calibration from the Navigation Dra…

…wer for the release
DroidPlanner · Feb 27, 2014 · ed82890 · ed82890
1 parent dcf0705
commit ed82890
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/DroidPlanner/src/org/droidplanner/activities/ConfigurationActivity.java b/DroidPlanner/src/org/droidplanner/activities/ConfigurationActivity.java
@@ -38,9 +38,9 @@ public class ConfigurationActivity extends SuperUI {
      * Holds the list of configuration screens this activity supports.
      */
     public static final Class<? extends Fragment>[] sConfigurationFragments = new Class[]{
-            TuningFragment.class,
+            //TuningFragment.class,
             SetupRadioFragment.class,
-            SetupSensorFragment.class,
+            //SetupSensorFragment.class,
             ChecklistFragment.class,
             ParamsFragment.class
     };
@@ -49,17 +49,17 @@ public class ConfigurationActivity extends SuperUI {
      * Holds the title resources for the configuration screens.
      */
     public static final int[] sConfigurationFragmentTitlesRes = {
-            R.string.screen_tuning,
+            //R.string.screen_tuning,
             R.string.screen_rc,
-            R.string.screen_cal,
+            //R.string.screen_cal,
             R.string.screen_checklist,
             R.string.screen_parameters
     };
 
     public static final int[] sConfigurationFragmentIconRes = {
-            android.R.drawable.ic_menu_preferences,
+            //android.R.drawable.ic_menu_preferences,
             R.drawable.ic_status_rssi,
-            R.drawable.ic_action_circles,
+            //R.drawable.ic_action_circles,
             R.drawable.ic_action_paste,
             R.drawable.ic_action_database
     };
@@ -86,7 +86,7 @@ public void onCreate(Bundle savedInstanceState) {
         mViewPager = (ViewPager) findViewById(R.id.configuration_pager);
         mViewPager.setAdapter(pagerAdapter);
 
-        /*
+        /* 
         Figure out if we're running on a tablet like device, or a phone.
         The phone layout doesn't have the tab strip, so the tabIndicator will be null.
          */

diff --git a/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java b/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java
@@ -51,7 +51,7 @@ public class NavigationDrawerAdapter extends BaseExpandableListAdapter {
         sActivityGroupIndexMap.put(SettingsActivity.class, 1);
     }
 
-    private final static boolean[] sIsGroupExpanded = {false, false, false};
+    private final static boolean[] sIsGroupExpanded = {false, false};
 
     /**
      * Delay used to run the callback on selection in the drawer layout. This delay allows the
@@ -226,7 +226,7 @@ public void run() {
         Help section
          */
         //No children for the help section
-        mChildData.add(Collections.<Map<String, ? extends Object>>emptyList());
+       // mChildData.add(Collections.<Map<String, ? extends Object>>emptyList());
     }
 
     private void initGroupData(final DrawerNavigationUI activity) {
@@ -255,6 +255,7 @@ public void run() {
         mGroupData.add(droneSetupData);
 
         //Help section
+      /*  
         final Map<String, Object> helpData = new HashMap<String, Object>();
         helpData.put(KEY_SECTION_NAME, R.string.help);
         helpData.put(KEY_SECTION_ICON, R.drawable.ic_action_help);
@@ -266,6 +267,7 @@ public void run() {
             }
         });
         mGroupData.add(helpData);
+        */
     }
 
     @Override