commit a8b78728aa25a29af6435f3624ee3f336de8ef0b
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Dec 13 10:18:33 2013 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Dec 13 10:18:33 2013 -0500
tree 159089ddb668d39758e169b7e98fa74a13970752
parent 4d20c81371c5386c8b6aa65d1be6af44b334b8bb

* #36914: New navigation working

This commit impacts the whole structure app, because we now have
nested Fragments. To keep retro-compatibility, we switched from normal
Fragment to Fragment from the support library.

src/org/sflphone/client/HomeActivity.java

diff --git a/src/org/sflphone/client/HomeActivity.java b/src/org/sflphone/client/HomeActivity.java
index f9f12c9..0319083 100644
--- a/src/org/sflphone/client/HomeActivity.java
+++ b/src/org/sflphone/client/HomeActivity.java
@@ -62,8 +62,6 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Fragment;
-import android.app.FragmentManager.BackStackEntry;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -82,6 +80,9 @@
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.SipAddress;
 import android.support.v4.app.ActionBarDrawerToggle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager.BackStackEntry;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.util.Log;
@@ -91,8 +92,8 @@
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
-public class HomeActivity extends Activity implements DialingFragment.Callbacks, AccountsManagementFragment.Callbacks, ContactListFragment.Callbacks,
-        CallListFragment.Callbacks, HistoryFragment.Callbacks, CallInterface, MenuFragment.Callbacks {
+public class HomeActivity extends FragmentActivity implements DialingFragment.Callbacks, AccountsManagementFragment.Callbacks,
+        ContactListFragment.Callbacks, CallListFragment.Callbacks, HistoryFragment.Callbacks, CallInterface, MenuFragment.Callbacks {
 
     static final String TAG = HomeActivity.class.getSimpleName();
 
@@ -324,12 +325,12 @@
             return;
         }
 
-        if (getFragmentManager().getBackStackEntryCount() > 0) {
-            BackStackEntry entry = getFragmentManager().getBackStackEntryAt(getFragmentManager().getBackStackEntryCount() - 1);
+        if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
+            BackStackEntry entry = getSupportFragmentManager().getBackStackEntryAt(getSupportFragmentManager().getBackStackEntryCount() - 1);
 
-            fContent = getFragmentManager().findFragmentByTag(entry.getName());
+            fContent = getSupportFragmentManager().findFragmentByTag(entry.getName());
 
-            getFragmentManager().popBackStack();
+            getSupportFragmentManager().popBackStack();
             return;
         }
 
@@ -397,7 +398,7 @@
 
                 fMenu = new MenuFragment();
                 fContent = new HomeFragment();
-                getFragmentManager().beginTransaction().replace(R.id.left_drawer, fMenu).replace(R.id.main_frame, fContent).commit();
+                getSupportFragmentManager().beginTransaction().replace(R.id.left_drawer, fMenu).replace(R.id.main_frame, fContent).commit();
 
                 service.destroyNotification();
             } catch (RemoteException e) {
@@ -675,20 +676,18 @@
 
     @Override
     public void onSectionSelected(int pos) {
-        Intent in = new Intent();
-
         switch (pos) {
         case 0:
             fContent = new HomeFragment();
-            getFragmentManager().beginTransaction().replace(R.id.main_frame, fContent).addToBackStack("HomeTransac").commit();
+            getSupportFragmentManager().beginTransaction().replace(R.id.main_frame, fContent).addToBackStack("HomeTransac").commit();
             break;
         case 1:
             fContent = new AccountsManagementFragment();
-            getFragmentManager().beginTransaction().replace(R.id.main_frame, fContent).addToBackStack("AccountsTransac").commit();
+            getSupportFragmentManager().beginTransaction().replace(R.id.main_frame, fContent).addToBackStack("AccountsTransac").commit();
             break;
         case 2:
             fContent = new AboutFragment();
-            getFragmentManager().beginTransaction().replace(R.id.main_frame, fContent).addToBackStack("AboutTransac").commit();
+            getSupportFragmentManager().beginTransaction().replace(R.id.main_frame, fContent).addToBackStack("AboutTransac").commit();
             break;
         }