projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
downloader made background thread
[pub/Android/ownCloud.git]
/
src
/
eu
/
alefzero
/
owncloud
/
ui
/
fragment
/
ActionBar.java
diff --git
a/src/eu/alefzero/owncloud/ui/fragment/ActionBar.java
b/src/eu/alefzero/owncloud/ui/fragment/ActionBar.java
index
8810be7
..
904d6bb
100644
(file)
--- a/
src/eu/alefzero/owncloud/ui/fragment/ActionBar.java
+++ b/
src/eu/alefzero/owncloud/ui/fragment/ActionBar.java
@@
-17,13
+17,13
@@
*/
\r
package eu.alefzero.owncloud.ui.fragment;
\r
\r
*/
\r
package eu.alefzero.owncloud.ui.fragment;
\r
\r
-import eu.alefzero.owncloud.R;
\r
-import android.app.Activity;
\r
import android.os.Bundle;
\r
import android.support.v4.app.Fragment;
\r
import android.os.Bundle;
\r
import android.support.v4.app.Fragment;
\r
+import android.support.v4.app.SupportActivity;
\r
import android.view.LayoutInflater;
\r
import android.view.View;
\r
import android.view.ViewGroup;
\r
import android.view.LayoutInflater;
\r
import android.view.View;
\r
import android.view.ViewGroup;
\r
+import eu.alefzero.owncloud.R;
\r
\r
/**
\r
* A custom ActionBar implementation used in the FileDisplayActivity
\r
\r
/**
\r
* A custom ActionBar implementation used in the FileDisplayActivity
\r
@@
-45,7
+45,7
@@
public class ActionBar extends Fragment {
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
- public void onAttach(Activity activity) {
\r
+ public void onAttach(
Support
Activity activity) {
\r
super.onAttach(activity);
\r
}
\r
\r
super.onAttach(activity);
\r
}
\r
\r