From: Andy Scherzinger Date: Thu, 13 Aug 2015 16:46:19 +0000 (+0200) Subject: moved everything to AppCompatActivity since ActionBarActivity is deprecated X-Git-Tag: beta-20151128~7^2~59 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/455b349c085476778922680a737710ccce9b67d7 moved everything to AppCompatActivity since ActionBarActivity is deprecated --- diff --git a/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java b/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java index 7dfb38b0..78d95e43 100644 --- a/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java @@ -19,7 +19,6 @@ package com.owncloud.android.authentication; import android.accounts.AccountAuthenticatorResponse; import android.accounts.AccountManager; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity; /* diff --git a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java index d7d96fab..3162dd7f 100644 --- a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java +++ b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java @@ -30,7 +30,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; import android.support.v4.app.DialogFragment; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.View; @@ -61,7 +61,7 @@ import com.owncloud.android.utils.FileStorageUtils; * * Shown when the error notification summarizing the list of errors is clicked by the user. */ -public class ErrorsWhileCopyingHandlerActivity extends ActionBarActivity +public class ErrorsWhileCopyingHandlerActivity extends AppCompatActivity implements OnClickListener { private static final String TAG = ErrorsWhileCopyingHandlerActivity.class.getSimpleName(); diff --git a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java index 28e13233..a0c9d5e0 100644 --- a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java +++ b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java @@ -25,8 +25,7 @@ import java.util.ArrayList; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.text.method.ScrollingMovementMethod; import android.view.View; import android.view.ViewGroup; @@ -45,7 +44,7 @@ import com.owncloud.android.utils.DisplayUtils; * Added to show explanations for notifications when the user clicks on them, and there no place * better to show them. */ -public class GenericExplanationActivity extends ActionBarActivity { +public class GenericExplanationActivity extends AppCompatActivity { public static final String EXTRA_LIST = GenericExplanationActivity.class.getCanonicalName() + ".EXTRA_LIST"; diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java index 96e3c79e..3ca5b2c4 100644 --- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java +++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java @@ -35,8 +35,7 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.ActionBar; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -51,7 +50,7 @@ import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.FileStorageUtils; -public class LogHistoryActivity extends ActionBarActivity { +public class LogHistoryActivity extends AppCompatActivity { private static final String MAIL_ATTACHMENT_TYPE = "text/plain"; diff --git a/src/com/owncloud/android/ui/activity/PassCodeActivity.java b/src/com/owncloud/android/ui/activity/PassCodeActivity.java index 39727dcd..cc4170fe 100644 --- a/src/com/owncloud/android/ui/activity/PassCodeActivity.java +++ b/src/com/owncloud/android/ui/activity/PassCodeActivity.java @@ -27,8 +27,7 @@ import java.util.Arrays; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.ActionBar; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -41,10 +40,8 @@ import android.widget.Toast; import com.owncloud.android.R; import com.owncloud.android.lib.common.utils.Log_OC; -import com.owncloud.android.utils.DisplayUtils; - -public class PassCodeActivity extends ActionBarActivity { +public class PassCodeActivity extends AppCompatActivity { private static final String TAG = PassCodeActivity.class.getSimpleName(); @@ -537,5 +534,4 @@ public class PassCodeActivity extends ActionBarActivity { } - }