diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4bda42092..4abe0b4eb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ - - + + diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar deleted file mode 100644 index e74b0d77d..000000000 Binary files a/libs/android-support-v4.jar and /dev/null differ diff --git a/src/org/linphone/AboutFragment.java b/src/org/linphone/AboutFragment.java index 7a190cfa3..1e9d70fd6 100644 --- a/src/org/linphone/AboutFragment.java +++ b/src/org/linphone/AboutFragment.java @@ -21,9 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import org.linphone.core.LinphoneCore; import org.linphone.mediastream.Log; +import android.app.Fragment; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/linphone/AcceptCallUpdateDialogFragment.java b/src/org/linphone/AcceptCallUpdateDialogFragment.java index 52d2d1e5c..4843d2a02 100644 --- a/src/org/linphone/AcceptCallUpdateDialogFragment.java +++ b/src/org/linphone/AcceptCallUpdateDialogFragment.java @@ -23,7 +23,7 @@ import org.linphone.mediastream.Log; import android.annotation.SuppressLint; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v4.app.DialogFragment; +import android.app.DialogFragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/linphone/AudioCallFragment.java b/src/org/linphone/AudioCallFragment.java index a8287d125..bae498563 100644 --- a/src/org/linphone/AudioCallFragment.java +++ b/src/org/linphone/AudioCallFragment.java @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import android.app.Activity; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; diff --git a/src/org/linphone/ChatActivity.java b/src/org/linphone/ChatActivity.java index 5b0884679..a29b5ab14 100644 --- a/src/org/linphone/ChatActivity.java +++ b/src/org/linphone/ChatActivity.java @@ -18,14 +18,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +import android.app.Activity; +import android.app.FragmentManager; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; /** * @author Margaux Clerc */ -public class ChatActivity extends FragmentActivity { +public class ChatActivity extends Activity { private static final String CHAT_FRAGMENT = "chatFragment"; private ChatFragment chatFragment; @@ -42,9 +42,9 @@ public class ChatActivity extends FragmentActivity { ChatFragment fragment = new ChatFragment(); fragment.setArguments(extras); - getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainer, fragment, "ChatFragment").commit(); + getFragmentManager().beginTransaction().add(R.id.fragmentContainer, fragment, "ChatFragment").commit(); - FragmentManager fm = getSupportFragmentManager(); + FragmentManager fm = getFragmentManager(); chatFragment = (ChatFragment) fm.findFragmentByTag(CHAT_FRAGMENT); // If the Fragment is non-null, then it is currently being diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index d5049aa98..24c599ea3 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -22,6 +22,8 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; + +import android.content.CursorLoader; import android.graphics.Matrix; import java.util.ArrayList; import java.util.List; @@ -44,7 +46,6 @@ import org.linphone.ui.AvatarWithShadow; import org.linphone.ui.BubbleChat; import android.media.ExifInterface; -import android.support.v4.content.CursorLoader; import android.annotation.SuppressLint; import android.app.Activity; @@ -62,7 +63,7 @@ import android.os.Bundle; import android.os.Environment; import android.os.Parcelable; import android.provider.MediaStore; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java index e6a8b7e8d..98ae12f92 100644 --- a/src/org/linphone/ChatListFragment.java +++ b/src/org/linphone/ChatListFragment.java @@ -38,7 +38,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; diff --git a/src/org/linphone/ContactFragment.java b/src/org/linphone/ContactFragment.java index cc07822f8..1a2739612 100644 --- a/src/org/linphone/ContactFragment.java +++ b/src/org/linphone/ContactFragment.java @@ -33,7 +33,7 @@ import android.content.DialogInterface; import android.graphics.BitmapFactory; import android.os.Bundle; import android.provider.ContactsContract; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/linphone/ContactsFragment.java b/src/org/linphone/ContactsFragment.java index c8e0d4cf2..874b90869 100644 --- a/src/org/linphone/ContactsFragment.java +++ b/src/org/linphone/ContactsFragment.java @@ -29,7 +29,7 @@ import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java index 61319cc6e..b0e346ca5 100644 --- a/src/org/linphone/DialerFragment.java +++ b/src/org/linphone/DialerFragment.java @@ -27,7 +27,7 @@ import org.linphone.ui.EraseButton; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/linphone/EditContactFragment.java b/src/org/linphone/EditContactFragment.java index ca62beb4f..9f66c2878 100644 --- a/src/org/linphone/EditContactFragment.java +++ b/src/org/linphone/EditContactFragment.java @@ -14,7 +14,7 @@ import android.database.Cursor; import android.graphics.BitmapFactory; import android.os.Bundle; import android.provider.ContactsContract; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; diff --git a/src/org/linphone/HistoryDetailFragment.java b/src/org/linphone/HistoryDetailFragment.java index ceea76b21..e09b054fa 100644 --- a/src/org/linphone/HistoryDetailFragment.java +++ b/src/org/linphone/HistoryDetailFragment.java @@ -23,13 +23,12 @@ import java.util.Calendar; import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreFactory; -import org.linphone.mediastream.Log; import org.linphone.ui.AvatarWithShadow; import android.annotation.SuppressLint; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/linphone/HistoryFragment.java b/src/org/linphone/HistoryFragment.java index 3a3b87ddc..9fb979cba 100644 --- a/src/org/linphone/HistoryFragment.java +++ b/src/org/linphone/HistoryFragment.java @@ -30,7 +30,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.util.SparseArray; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; diff --git a/src/org/linphone/HistorySimpleFragment.java b/src/org/linphone/HistorySimpleFragment.java index aa5abdeff..b72d908e6 100644 --- a/src/org/linphone/HistorySimpleFragment.java +++ b/src/org/linphone/HistorySimpleFragment.java @@ -33,7 +33,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index 032209db5..3eba28e61 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -36,6 +36,8 @@ import org.linphone.ui.AvatarWithShadow; import org.linphone.ui.Numpad; import android.app.Activity; +import android.app.FragmentManager; +import android.app.FragmentTransaction; import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; @@ -44,10 +46,7 @@ import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; import android.os.SystemClock; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import android.app.Fragment; import android.view.Gravity; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -70,7 +69,7 @@ import android.widget.Toast; /** * @author Sylvain Berfini */ -public class InCallActivity extends FragmentActivity implements OnClickListener { +public class InCallActivity extends Activity implements OnClickListener { private final static int SECONDS_BEFORE_HIDING_CONTROLS = 3000; private final static int SECONDS_BEFORE_DENYING_CALL_UPDATE = 30000; @@ -271,7 +270,7 @@ public class InCallActivity extends FragmentActivity implements OnClickListener } callFragment.setArguments(getIntent().getExtras()); - getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainer, callFragment).commitAllowingStateLoss(); + getFragmentManager().beginTransaction().add(R.id.fragmentContainer, callFragment).commitAllowingStateLoss(); } } @@ -635,7 +634,7 @@ public class InCallActivity extends FragmentActivity implements OnClickListener private void replaceFragmentVideoByAudio() { audioCallFragment = new AudioCallFragment(); - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + FragmentTransaction transaction = getFragmentManager().beginTransaction(); transaction.replace(R.id.fragmentContainer, audioCallFragment); try { transaction.commitAllowingStateLoss(); @@ -650,7 +649,7 @@ public class InCallActivity extends FragmentActivity implements OnClickListener videoCallFragment = new VideoCallFragment(); - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + FragmentTransaction transaction = getFragmentManager().beginTransaction(); transaction.replace(R.id.fragmentContainer, videoCallFragment); try { transaction.commitAllowingStateLoss(); @@ -1157,7 +1156,7 @@ public class InCallActivity extends FragmentActivity implements OnClickListener private void showAcceptCallUpdateDialog() { - FragmentManager fm = getSupportFragmentManager(); + FragmentManager fm = getFragmentManager(); callUpdateDialog = new AcceptCallUpdateDialogFragment(); callUpdateDialog.show(fm, "Accept Call Update Dialog"); } diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index c505e7792..f57d90fc7 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -50,20 +50,16 @@ import org.linphone.ui.AddressText; import android.annotation.SuppressLint; import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentManager; +import android.app.FragmentTransaction; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; -import android.database.ContentObserver; import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; -import android.provider.ContactsContract; -import android.support.v4.app.Fragment; -import android.support.v4.app.Fragment.SavedState; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; import android.view.Gravity; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -84,7 +80,7 @@ import android.widget.Toast; /** * @author Sylvain Berfini */ -public class LinphoneActivity extends FragmentActivity implements OnClickListener, ContactPicked { +public class LinphoneActivity extends Activity implements OnClickListener, ContactPicked { public static final String PREF_FIRST_LAUNCH = "pref_first_launch"; private static final int SETTINGS_ACTIVITY = 123; private static final int FIRST_LOGIN_ACTIVITY = 101; @@ -103,7 +99,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene private List fragmentsHistory; private Fragment dialerFragment, messageListFragment, friendStatusListenerFragment; private ChatFragment chatFragment; - private SavedState dialerSavedState; + private Fragment.SavedState dialerSavedState; private boolean isAnimationDisabled = false, preferLinphoneContacts = false; private OrientationEventListener mOrientationHelper; private LinphoneCoreListenerBase mListener; @@ -172,7 +168,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene if (findViewById(R.id.fragmentContainer) != null) { dialerFragment = new DialerFragment(); dialerFragment.setArguments(getIntent().getExtras()); - getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainer, dialerFragment, currentFragment.toString()).commit(); + getFragmentManager().beginTransaction().add(R.id.fragmentContainer, dialerFragment, currentFragment.toString()).commit(); selectMenu(FragmentsAvailable.DIALER); } } @@ -334,7 +330,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene if (currentFragment == FragmentsAvailable.DIALER) { try { - dialerSavedState = getSupportFragmentManager().saveFragmentInstanceState(dialerFragment); + dialerSavedState = getFragmentManager().saveFragmentInstanceState(dialerFragment); } catch (Exception e) { } } @@ -423,7 +419,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene statusFragment.closeStatusBar(); } - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + FragmentTransaction transaction = getFragmentManager().beginTransaction(); if (!withoutAnimation && !isAnimationDisabled && currentFragment.shouldAnimate()) { if (newFragmentType.isRightOf(currentFragment)) { @@ -449,7 +445,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene } transaction.replace(R.id.fragmentContainer, newFragment, newFragmentType.toString()); transaction.commitAllowingStateLoss(); - getSupportFragmentManager().executePendingTransactions(); + getFragmentManager().executePendingTransactions(); currentFragment = newFragmentType; } @@ -468,7 +464,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene LinearLayout ll = (LinearLayout) findViewById(R.id.fragmentContainer2); - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + FragmentTransaction transaction = getFragmentManager().beginTransaction(); if (newFragmentType.shouldAddItselfToTheRightOf(currentFragment)) { ll.setVisibility(View.VISIBLE); @@ -497,7 +493,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene transaction.replace(R.id.fragmentContainer, newFragment); } transaction.commitAllowingStateLoss(); - getSupportFragmentManager().executePendingTransactions(); + getFragmentManager().executePendingTransactions(); currentFragment = newFragmentType; if (newFragmentType == FragmentsAvailable.DIALER @@ -508,7 +504,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene || newFragmentType == FragmentsAvailable.CHATLIST || newFragmentType == FragmentsAvailable.HISTORY) { try { - getSupportFragmentManager().popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); + getFragmentManager().popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); } catch (java.lang.IllegalStateException e) { } @@ -543,7 +539,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene String callTime = secondsToDisplayableString(log.getCallDuration()); String callDate = String.valueOf(log.getTimestamp()); - Fragment fragment2 = getSupportFragmentManager().findFragmentById(R.id.fragmentContainer2); + Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2); if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.HISTORY_DETAIL) { HistoryDetailFragment historyDetailFragment = (HistoryDetailFragment) fragment2; historyDetailFragment.changeDisplayedHistory(sipUri, displayName, pictureUri, status, callTime, callDate); @@ -571,7 +567,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene } public void displayContact(Contact contact, boolean chatOnly) { - Fragment fragment2 = getSupportFragmentManager().findFragmentById(R.id.fragmentContainer2); + Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2); if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.CONTACT) { ContactFragment contactFragment = (ContactFragment) fragment2; contactFragment.changeDisplayedContact(contact); @@ -639,7 +635,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene if (isTablet()){ if (currentFragment == FragmentsAvailable.CHATLIST || currentFragment == FragmentsAvailable.CHAT){ - Fragment fragment2 = getSupportFragmentManager().findFragmentById(R.id.fragmentContainer2); + Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2); if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.CHAT) { ChatFragment chatFragment = (ChatFragment) fragment2; chatFragment.changeDisplayedChat(sipUri, displayName, pictureUri); diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java index 0c93276ff..f407105f4 100644 --- a/src/org/linphone/SettingsFragment.java +++ b/src/org/linphone/SettingsFragment.java @@ -50,7 +50,6 @@ import android.preference.Preference.OnPreferenceChangeListener; import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceCategory; import android.preference.PreferenceScreen; -import android.widget.EditText; /** * @author Sylvain Berfini diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java index e6f997b2c..139ab3a9b 100644 --- a/src/org/linphone/StatusFragment.java +++ b/src/org/linphone/StatusFragment.java @@ -43,7 +43,7 @@ import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/linphone/VideoCallFragment.java b/src/org/linphone/VideoCallFragment.java index 51744e887..89ac88fa1 100644 --- a/src/org/linphone/VideoCallFragment.java +++ b/src/org/linphone/VideoCallFragment.java @@ -29,7 +29,7 @@ import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration; import android.app.Activity; import android.opengl.GLSurfaceView; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.GestureDetector; import android.view.GestureDetector.OnDoubleTapListener; import android.view.GestureDetector.OnGestureListener; diff --git a/src/org/linphone/compatibility/ApiTwentyOnePlus.java b/src/org/linphone/compatibility/ApiTwentyOnePlus.java index c47fe007b..5c151c2f3 100644 --- a/src/org/linphone/compatibility/ApiTwentyOnePlus.java +++ b/src/org/linphone/compatibility/ApiTwentyOnePlus.java @@ -7,7 +7,6 @@ import android.app.Notification; import android.app.PendingIntent; import android.content.Context; import android.graphics.Bitmap; -import android.support.v4.app.NotificationCompat; import android.view.ViewTreeObserver; import android.view.ViewTreeObserver.OnGlobalLayoutListener; /* @@ -44,7 +43,7 @@ public class ApiTwentyOnePlus { title = context.getString(R.string.unread_messages).replace("%i", String.valueOf(msgCount)); } - Notification notif = new NotificationCompat.Builder(context) + Notification notif = new Notification.Builder(context) .setContentTitle(title) .setContentText(msg) .setSmallIcon(R.drawable.chat_icon_over) @@ -64,7 +63,7 @@ public class ApiTwentyOnePlus { String title, String msg, int iconID, Bitmap contactIcon, String contactName, PendingIntent intent) { - Notification notif = new NotificationCompat.Builder(context).setContentTitle(contactName) + Notification notif = new Notification.Builder(context).setContentTitle(contactName) .setContentText(msg) .setSmallIcon(iconID) .setAutoCancel(false) @@ -82,7 +81,7 @@ public class ApiTwentyOnePlus { Notification notif; if (largeIcon != null) { - notif = new NotificationCompat.Builder(context) + notif = new Notification.Builder(context) .setContentTitle(title) .setContentText(message) .setSmallIcon(icon, level) @@ -93,7 +92,7 @@ public class ApiTwentyOnePlus { .setPriority(priority) .build(); } else { - notif = new NotificationCompat.Builder(context) + notif = new Notification.Builder(context) .setContentTitle(title) .setContentText(message) .setSmallIcon(icon, level) @@ -112,7 +111,7 @@ public class ApiTwentyOnePlus { } public static Notification createSimpleNotification(Context context, String title, String text, PendingIntent intent) { - Notification notif = new NotificationCompat.Builder(context) + Notification notif = new Notification.Builder(context) .setContentTitle(title) .setContentText(text) .setSmallIcon(R.drawable.logo_linphone_57x57) diff --git a/src/org/linphone/setup/EchoCancellerCalibrationFragment.java b/src/org/linphone/setup/EchoCancellerCalibrationFragment.java index a347a5f3e..125272d24 100644 --- a/src/org/linphone/setup/EchoCancellerCalibrationFragment.java +++ b/src/org/linphone/setup/EchoCancellerCalibrationFragment.java @@ -33,7 +33,7 @@ import org.linphone.mediastream.Log; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/linphone/setup/GenericLoginFragment.java b/src/org/linphone/setup/GenericLoginFragment.java index ace26f74f..a043e8d69 100644 --- a/src/org/linphone/setup/GenericLoginFragment.java +++ b/src/org/linphone/setup/GenericLoginFragment.java @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import org.linphone.R; +import android.app.Fragment; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/linphone/setup/LinphoneLoginFragment.java b/src/org/linphone/setup/LinphoneLoginFragment.java index 69180a2c1..6e252108a 100644 --- a/src/org/linphone/setup/LinphoneLoginFragment.java +++ b/src/org/linphone/setup/LinphoneLoginFragment.java @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import org.linphone.R; +import android.app.Fragment; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/linphone/setup/MenuFragment.java b/src/org/linphone/setup/MenuFragment.java index 5eebba12c..ba893fc3e 100644 --- a/src/org/linphone/setup/MenuFragment.java +++ b/src/org/linphone/setup/MenuFragment.java @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import org.linphone.R; +import android.app.Fragment; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/linphone/setup/RemoteProvisioningFragment.java b/src/org/linphone/setup/RemoteProvisioningFragment.java index 4780d6a42..87da3325e 100644 --- a/src/org/linphone/setup/RemoteProvisioningFragment.java +++ b/src/org/linphone/setup/RemoteProvisioningFragment.java @@ -5,9 +5,9 @@ import org.linphone.LinphoneLauncherActivity; import org.linphone.LinphonePreferences; import org.linphone.R; +import android.app.Fragment; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java index bba6e8292..21d4db55f 100644 --- a/src/org/linphone/setup/SetupActivity.java +++ b/src/org/linphone/setup/SetupActivity.java @@ -31,12 +31,11 @@ import org.linphone.core.LinphoneCoreListenerBase; import org.linphone.core.LinphoneProxyConfig; import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentTransaction; import android.content.Context; import android.content.pm.ActivityInfo; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentTransaction; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; @@ -46,7 +45,7 @@ import android.widget.Toast; /** * @author Sylvain Berfini */ -public class SetupActivity extends FragmentActivity implements OnClickListener { +public class SetupActivity extends Activity implements OnClickListener { private static SetupActivity instance; private RelativeLayout back, next, cancel; private SetupFragmentsEnum currentFragment; @@ -138,7 +137,7 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { } private void changeFragment(Fragment newFragment) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + FragmentTransaction transaction = getFragmentManager().beginTransaction(); // transaction.addToBackStack(""); transaction.replace(R.id.fragmentContainer, newFragment); diff --git a/src/org/linphone/setup/WelcomeFragment.java b/src/org/linphone/setup/WelcomeFragment.java index 48d330731..844faee69 100644 --- a/src/org/linphone/setup/WelcomeFragment.java +++ b/src/org/linphone/setup/WelcomeFragment.java @@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import org.linphone.R; +import android.app.Fragment; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/linphone/setup/WizardConfirmFragment.java b/src/org/linphone/setup/WizardConfirmFragment.java index 0fbcbb482..cdf8e3812 100644 --- a/src/org/linphone/setup/WizardConfirmFragment.java +++ b/src/org/linphone/setup/WizardConfirmFragment.java @@ -21,9 +21,9 @@ import java.net.URL; import org.linphone.R; +import android.app.Fragment; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/linphone/setup/WizardFragment.java b/src/org/linphone/setup/WizardFragment.java index d9b642d16..b56cde764 100644 --- a/src/org/linphone/setup/WizardFragment.java +++ b/src/org/linphone/setup/WizardFragment.java @@ -29,11 +29,11 @@ import org.linphone.core.LinphoneProxyConfig; import android.accounts.Account; import android.accounts.AccountManager; import android.app.AlertDialog; +import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.text.Editable; import android.text.InputFilter; import android.text.Spanned; diff --git a/src/org/linphone/ui/PreferencesListFragment.java b/src/org/linphone/ui/PreferencesListFragment.java index 98d8e3d26..af35cc6fc 100644 --- a/src/org/linphone/ui/PreferencesListFragment.java +++ b/src/org/linphone/ui/PreferencesListFragment.java @@ -24,6 +24,7 @@ import org.linphone.R; import android.annotation.SuppressLint; import android.app.Activity; +import android.app.ListFragment; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -33,7 +34,6 @@ import android.preference.Preference; import android.preference.PreferenceGroup; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; -import android.support.v4.app.ListFragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup;