projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5b92747
)
moved everything to AppCompatActivity since ActionBarActivity is deprecated
author
Andy Scherzinger
<info@andy-scherzinger.de>
Thu, 13 Aug 2015 16:46:19 +0000
(18:46 +0200)
committer
Andy Scherzinger
<info@andy-scherzinger.de>
Thu, 13 Aug 2015 16:46:19 +0000
(18:46 +0200)
src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/activity/LogHistoryActivity.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/activity/PassCodeActivity.java
patch
|
blob
|
blame
|
history
diff --git
a/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
b/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
index
7dfb38b
..
78d95e4
100644
(file)
--- 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.accounts.AccountAuthenticatorResponse;
import android.accounts.AccountManager;
import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
/*
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
d7d96fa
..
3162dd7
100644
(file)
--- 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.os.Bundle;
import android.os.Handler;
import android.support.v4.app.DialogFragment;
-import android.support.v7.app.A
ctionBar
Activity;
+import android.support.v7.app.A
ppCompat
Activity;
import android.text.method.ScrollingMovementMethod;
import android.view.LayoutInflater;
import android.view.View;
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.
*/
*
* Shown when the error notification summarizing the list of errors is clicked by the user.
*/
-public class ErrorsWhileCopyingHandlerActivity extends A
ctionBar
Activity
+public class ErrorsWhileCopyingHandlerActivity extends A
ppCompat
Activity
implements OnClickListener {
private static final String TAG = ErrorsWhileCopyingHandlerActivity.class.getSimpleName();
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
28e1323
..
a0c9d5e
100644
(file)
--- 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.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;
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.
*/
* Added to show explanations for notifications when the user clicks on them, and there no place
* better to show them.
*/
-public class GenericExplanationActivity extends A
ctionBar
Activity {
+public class GenericExplanationActivity extends A
ppCompat
Activity {
public static final String EXTRA_LIST = GenericExplanationActivity.class.getCanonicalName() +
".EXTRA_LIST";
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
96e3c79
..
3ca5b2c
100644
(file)
--- 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.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;
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;
import com.owncloud.android.utils.FileStorageUtils;
-public class LogHistoryActivity extends A
ctionBar
Activity {
+public class LogHistoryActivity extends A
ppCompat
Activity {
private static final String MAIL_ATTACHMENT_TYPE = "text/plain";
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
39727dc
..
cc4170f
100644
(file)
--- 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.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;
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.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();
private static final String TAG = PassCodeActivity.class.getSimpleName();
@@
-537,5
+534,4
@@
public class PassCodeActivity extends ActionBarActivity {
}
}
-
}
}