commit 8a1bab80c221136fb71c397be05a813932ca9fd4
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Thu Oct 24 10:06:51 2013 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Thu Oct 24 10:06:51 2013 -0400
tree d069170683c201557c0a0e5251585a2876759106
parent 0bb52c9492eff3bad01f3033104b33e8d2844ab6

* #32378: removed navigation sections

src/org/sflphone/fragments/MenuFragment.java

diff --git a/src/org/sflphone/fragments/MenuFragment.java b/src/org/sflphone/fragments/MenuFragment.java
index cabfc66..3b9b936 100644
--- a/src/org/sflphone/fragments/MenuFragment.java
+++ b/src/org/sflphone/fragments/MenuFragment.java
@@ -53,6 +53,7 @@
 import android.content.IntentFilter;
 import android.content.Loader;
 import android.os.Bundle;
+import android.os.RemoteException;
 import android.provider.ContactsContract.Profile;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -118,14 +119,14 @@
         accountReceiver = new AccountsReceiver(this);
 
         String[] categories = getResources().getStringArray(R.array.menu_categories);
-        ArrayAdapter<String> paramAdapter = new ArrayAdapter<String>(getActivity(), R.layout.item_menu, getResources().getStringArray(
-                R.array.menu_items_param));
-        ArrayAdapter<String> helpAdapter = new ArrayAdapter<String>(getActivity(), R.layout.item_menu, getResources().getStringArray(
-                R.array.menu_items_help));
+//        ArrayAdapter<String> paramAdapter = new ArrayAdapter<String>(getActivity(), R.layout.item_menu, getResources().getStringArray(
+//                R.array.menu_items_param));
+//        ArrayAdapter<String> helpAdapter = new ArrayAdapter<String>(getActivity(), R.layout.item_menu, getResources().getStringArray(
+//                R.array.menu_items_help));
 
         // Add Sections
-        mAdapter.addSection(categories[0], paramAdapter);
-        mAdapter.addSection(categories[1], helpAdapter);
+        //mAdapter.addSection(categories[0], paramAdapter);
+        //mAdapter.addSection(categories[1], helpAdapter);
 
     }
 
@@ -149,7 +150,9 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
         View inflatedView = inflater.inflate(R.layout.frag_menu, parent, false);
 
-        ((ListView) inflatedView.findViewById(R.id.listView)).setAdapter(mAdapter);
+        ArrayAdapter<String> paramAdapter = new ArrayAdapter<String>(getActivity(), R.layout.item_menu, getResources().getStringArray(
+                R.array.menu_items_param));
+        ((ListView) inflatedView.findViewById(R.id.listView)).setAdapter(paramAdapter);
         ((ListView) inflatedView.findViewById(R.id.listView)).setOnItemClickListener(new OnItemClickListener() {
 
             @Override
@@ -157,7 +160,7 @@
 
                 Intent in = new Intent();
                 switch (pos) {
-                case 1:
+                case 0:
                     in.setClass(getActivity(), SFLPhonePreferenceActivity.class);
                     getActivity().startActivityForResult(in, SFLPhoneHomeActivity.REQUEST_CODE_PREFERENCES);
                     break;
@@ -166,7 +169,7 @@
                 // in.setClass(getActivity(), ActivityHolder.class);
                 // getActivity().startActivity(in);
                 // break;
-                case 3:
+                case 1:
                     in.putExtra("ActivityHolder.args", ActivityHolder.args.FRAG_ABOUT);
                     in.setClass(getActivity(), ActivityHolder.class);
                     getActivity().startActivity(in);
@@ -186,6 +189,11 @@
                     ((RadioButton) view.findViewById(R.id.account_checked)).toggle();
                 }
                 mAccountAdapter.setSelectedAccount(pos);
+                try {
+                    mCallbacks.getService().setAccountOrder(mAccountAdapter.getAccountOrder());
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                }
             }
 
             @Override