Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android...

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / PassCodeActivity.java

diff --git a/src/com/owncloud/android/ui/activity/PassCodeActivity.java b/src/com/owncloud/android/ui/activity/PassCodeActivity.java
index 09a9630..1697439 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();
 


@@ -128,9 +125,6 @@ public class PassCodeActivity extends ActionBarActivity {
         }
 
         setTextListeners();
         }
 
         setTextListeners();

-        
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setIcon(DisplayUtils.getSeasonalIconId());

     }
 
 
     }