diff options
author | Daniel Ramos <hiperzone@gmail.com> | 2015-04-26 18:27:07 +0100 |
---|---|---|
committer | Daniel Ramos <hiperzone@gmail.com> | 2015-04-26 18:27:07 +0100 |
commit | 674f377bd4e163bdcebb09c12a99947578b7265d (patch) | |
tree | 392903a0e7e72c9a06e6d80caeec1e9cd6b7af2f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java | |
parent | 40122d61ccd13a06602cf614f18aedee82bf1ad0 (diff) | |
parent | 9eb98f6eb712ec6130ce45772fd6c351afdab1b2 (diff) | |
download | open-keychain-674f377bd4e163bdcebb09c12a99947578b7265d.tar.gz open-keychain-674f377bd4e163bdcebb09c12a99947578b7265d.tar.bz2 open-keychain-674f377bd4e163bdcebb09c12a99947578b7265d.zip |
Merge branch 'development' of https://github.com/open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java index 963e77fe9..7b911da96 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java @@ -21,7 +21,7 @@ import android.app.Activity; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentPagerAdapter; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import java.util.ArrayList; @@ -41,7 +41,7 @@ public class PagerTabStripAdapter extends FragmentPagerAdapter { } } - public PagerTabStripAdapter(ActionBarActivity activity) { + public PagerTabStripAdapter(AppCompatActivity activity) { super(activity.getSupportFragmentManager()); mActivity = activity; } |