From ed82890ba7edeb401b7b99960f6d90bb85ae83fa Mon Sep 17 00:00:00 2001 From: Arthur Benemann Date: Thu, 27 Feb 2014 14:47:19 -0300 Subject: [PATCH] Release: Removed Help, Tuning and calibration from the Navigation Drawer for the release --- .../activities/ConfigurationActivity.java | 14 +++++++------- .../adapterViews/NavigationDrawerAdapter.java | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/DroidPlanner/src/org/droidplanner/activities/ConfigurationActivity.java b/DroidPlanner/src/org/droidplanner/activities/ConfigurationActivity.java index 8c9edb3eba..605f8dd424 100644 --- 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[] 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 index 2be7ae4a17..980195c657 100644 --- 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.>emptyList()); + // mChildData.add(Collections.>emptyList()); } private void initGroupData(final DrawerNavigationUI activity) { @@ -255,6 +255,7 @@ public void run() { mGroupData.add(droneSetupData); //Help section + /* final Map helpData = new HashMap(); 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