renamed Activities

AndroidManifest.xml

@@ -32,8 +32,8 @@ as that of the covered work.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.sflphone"
-    android:versionCode="6"
-    android:versionName="1.2.3.03" >
+    android:versionCode="7"
+    android:versionName="1.2.3.04" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -79,7 +79,7 @@ as that of the covered work.
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
         <activity
-            android:name="org.sflphone.client.SFLPhoneHomeActivity"
+            android:name="org.sflphone.client.HomeActivity"
             android:label="@string/title_activity_sflphone_home"
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeWithOverlay"
@@ -91,7 +91,7 @@ as that of the covered work.
             </intent-filter>
         </activity>
         <activity
-            android:name="org.sflphone.client.SFLPhonePreferenceActivity"
+            android:name="org.sflphone.client.SettingsActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeWithoutOverlay" >
             <meta-data

src/org/sflphone/client/CallActivity.java

@@ -71,12 +71,8 @@ import android.support.v4.widget.SlidingPaneLayout;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.ViewPropertyAnimator;
 import android.view.Window;
 import android.view.WindowManager;
-import android.view.animation.BounceInterpolator;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Toast;
 
 public class CallActivity extends Activity implements CallInterface, IMFragment.Callbacks, CallFragment.Callbacks, ProximityDirector {
     static final String TAG = "CallActivity";
@@ -327,7 +323,7 @@ public class CallActivity extends Activity implements CallInterface, IMFragment.
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        Intent launchHome = new Intent(this, SFLPhoneHomeActivity.class);
+        Intent launchHome = new Intent(this, HomeActivity.class);
         launchHome.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         launchHome.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(launchHome);
@@ -351,7 +347,6 @@ public class CallActivity extends Activity implements CallInterface, IMFragment.
 
     @Override
     public void recordingChanged(Intent intent) {
-        // mCallsFragment.update();
     }
 
     @Override

src/org/sflphone/client/SFLPhoneHomeActivity.java → src/org/sflphone/client/HomeActivity.java

@@ -84,7 +84,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
-public class SFLPhoneHomeActivity extends Activity implements DialingFragment.Callbacks, ContactListFragment.Callbacks, HomeFragment.Callbacks,
+public class HomeActivity extends Activity implements DialingFragment.Callbacks, ContactListFragment.Callbacks, HomeFragment.Callbacks,
         HistoryFragment.Callbacks, CallInterface, MenuFragment.Callbacks {
 
     SectionsPagerAdapter mSectionsPagerAdapter = null;
@@ -352,7 +352,7 @@ public class SFLPhoneHomeActivity extends Activity implements DialingFragment.Ca
 
                 fMenu = new MenuFragment();
                 getFragmentManager().beginTransaction().replace(R.id.left_drawer, fMenu).commit();
-                mSectionsPagerAdapter = new SectionsPagerAdapter(SFLPhoneHomeActivity.this, getFragmentManager());
+                mSectionsPagerAdapter = new SectionsPagerAdapter(HomeActivity.this, getFragmentManager());
 
                 // initialiseTabHost(null);
                 mViewPager.setOffscreenPageLimit(2);
@@ -513,7 +513,7 @@ public class SFLPhoneHomeActivity extends Activity implements DialingFragment.Ca
             }
         });
         launcher.start();
-        mContactDrawer.close();
+        mContactDrawer.animateClose();
 
     }
 
@@ -570,7 +570,7 @@ public class SFLPhoneHomeActivity extends Activity implements DialingFragment.Ca
                     public void onClick(DialogInterface dialog, int whichButton) {
                         Intent in = new Intent();
                         in.setClass(ownerActivity, AccountWizard.class);
-                        ownerActivity.startActivityForResult(in, SFLPhoneHomeActivity.REQUEST_CODE_PREFERENCES);
+                        ownerActivity.startActivityForResult(in, HomeActivity.REQUEST_CODE_PREFERENCES);
                     }
                 }).setNegativeButton(getResources().getString(android.R.string.cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
@@ -586,7 +586,7 @@ public class SFLPhoneHomeActivity extends Activity implements DialingFragment.Ca
 
     @Override
     public void onContactDragged() {
-        mContactDrawer.close();
+        mContactDrawer.animateClose();
     }
 
     @Override

src/org/sflphone/client/SFLPhonePreferenceActivity.java → src/org/sflphone/client/SettingsActivity.java

@@ -52,9 +52,9 @@ import android.support.v4.view.ViewPager;
 import android.util.Log;
 import android.view.MenuItem;
 
-public class SFLPhonePreferenceActivity extends Activity implements AccountManagementFragment.Callbacks{
+public class SettingsActivity extends Activity implements AccountManagementFragment.Callbacks{
 
-    static final String TAG = SFLPhonePreferenceActivity.class.getSimpleName();
+    static final String TAG = SettingsActivity.class.getSimpleName();
     PreferencesPagerAdapter mPreferencesPagerAdapter;
     private boolean mBound = false;
     private ISipService service;

src/org/sflphone/fragments/AccountCreationFragment.java

@@ -7,7 +7,7 @@ import org.sflphone.account.AccountDetailAdvanced;
 import org.sflphone.account.AccountDetailBasic;
 import org.sflphone.account.AccountDetailSrtp;
 import org.sflphone.account.AccountDetailTls;
-import org.sflphone.client.SFLPhonePreferenceActivity;
+import org.sflphone.client.SettingsActivity;
 import org.sflphone.service.ISipService;
 
 import android.app.Activity;
@@ -56,7 +56,6 @@ public class AccountCreationFragment extends Fragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // mAdapter = new HistoryAdapter(getActivity(),new ArrayList<HashMap<String, String>>());
     }
 
     @Override
@@ -252,7 +251,7 @@ public class AccountCreationFragment extends Fragment {
 
         createNewAccount(accountDetails);
 
-        Intent resultIntent = new Intent(getActivity(), SFLPhonePreferenceActivity.class);
+        Intent resultIntent = new Intent(getActivity(), SettingsActivity.class);
         getActivity().setResult(Activity.RESULT_OK, resultIntent);
         resultIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
         startActivity(resultIntent);

src/org/sflphone/fragments/HistoryFragment.java

@@ -31,7 +31,6 @@
 package org.sflphone.fragments;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -45,6 +44,7 @@ import org.sflphone.service.ISipService;
 import android.app.Activity;
 import android.app.ListFragment;
 import android.app.LoaderManager.LoaderCallbacks;
+import android.content.Context;
 import android.content.Loader;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -59,6 +59,7 @@ import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 

src/org/sflphone/fragments/MenuFragment.java

@@ -37,8 +37,8 @@ import org.sflphone.adapters.AccountSelectionAdapter;
 import org.sflphone.adapters.ContactPictureTask;
 import org.sflphone.adapters.MenuAdapter;
 import org.sflphone.client.ActivityHolder;
-import org.sflphone.client.SFLPhoneHomeActivity;
-import org.sflphone.client.SFLPhonePreferenceActivity;
+import org.sflphone.client.HomeActivity;
+import org.sflphone.client.SettingsActivity;
 import org.sflphone.interfaces.AccountsInterface;
 import org.sflphone.loaders.AccountsLoader;
 import org.sflphone.loaders.LoaderConstants;
@@ -123,14 +123,14 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
         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);
 
     }
 
@@ -165,8 +165,8 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
                 Intent in = new Intent();
                 switch (pos) {
                 case 0:
-                    in.setClass(getActivity(), SFLPhonePreferenceActivity.class);
-                    getActivity().startActivityForResult(in, SFLPhoneHomeActivity.REQUEST_CODE_PREFERENCES);
+                    in.setClass(getActivity(), SettingsActivity.class);
+                    getActivity().startActivityForResult(in, HomeActivity.REQUEST_CODE_PREFERENCES);
                     break;
                 case 1:
                     in.putExtra("ActivityHolder.args", ActivityHolder.args.FRAG_ABOUT);

src/org/sflphone/model/BubblesView.java

@@ -343,9 +343,6 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback,
 
             Bubble expand = getExpandedBubble();
             if (expand != null) {
-                
-                Toast.makeText(getContext(), "Action:"+expand.getDrawer().getAction(event.getX(), event.getY()), Toast.LENGTH_SHORT).show();
-
                 switch (expand.getDrawer().getAction(event.getX(), event.getY())) {
                 case Bubble.actions.OUT_OF_BOUNDS:
                     expand.retract();

src/org/sflphone/service/SipService.java

@@ -38,7 +38,7 @@ import org.sflphone.account.AccountDetailBasic;
 import org.sflphone.account.AccountDetailsHandler;
 import org.sflphone.account.CallDetailsHandler;
 import org.sflphone.account.HistoryHandler;
-import org.sflphone.client.SFLPhoneHomeActivity;
+import org.sflphone.client.HomeActivity;
 import org.sflphone.model.Codec;
 import org.sflphone.model.Conference;
 import org.sflphone.model.SipCall;
@@ -1186,7 +1186,7 @@ public class SipService extends Service {
             if (current_calls.size() == 0) {
                 return;
             }
-            Intent notificationIntent = new Intent(getApplicationContext(), SFLPhoneHomeActivity.class);
+            Intent notificationIntent = new Intent(getApplicationContext(), HomeActivity.class);
             PendingIntent contentIntent = PendingIntent.getActivity(getApplicationContext(), 007, notificationIntent,
                     PendingIntent.FLAG_UPDATE_CURRENT);