X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/aa14479e5b2eefdbd654465ce2c9c90b171f6355..c3d88a0594e32043b2599a37789b7ada4a9ac85a:/src/com/owncloud/android/ui/activity/PinCodeActivity.java

diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
index c545fb22..83e3f644 100644
--- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
@@ -2,9 +2,8 @@
  *   Copyright (C) 2011 Bartek Przybylski
  *
  *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +18,10 @@ package com.owncloud.android.ui.activity;
 
 import java.util.Arrays;
 
+import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-
 import com.owncloud.android.R;
+import com.owncloud.android.utils.DisplayUtils;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -48,6 +48,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     
     Button bCancel;
     TextView mPinHdr;
+    TextView mPinHdrExplanation;
     EditText mText1;
     EditText mText2;
     EditText mText3;
@@ -73,6 +74,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
      
         bCancel = (Button) findViewById(R.id.cancel);
         mPinHdr = (TextView) findViewById(R.id.pinHdr);
+        mPinHdrExplanation = (TextView) findViewById(R.id.pinHdrExpl);
         mText1 = (EditText) findViewById(R.id.txt1);
         mText1.requestFocus();
         getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
@@ -80,8 +82,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         mText3 = (EditText) findViewById(R.id.txt3);
         mText4 = (EditText) findViewById(R.id.txt4);
         
-        
-        
         SharedPreferences appPrefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext());
         
@@ -100,6 +100,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                if (activity.equals("preferences")){
                 // PIN has been activated yet
                  mPinHdr.setText(R.string.pincode_configure_your_pin);
+                 mPinHdrExplanation.setVisibility(View.VISIBLE);
                  pinCodeChecked = true ; // No need to check it 
                  setChangePincodeView(true);
                }else{
@@ -107,12 +108,14 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                  bCancel.setVisibility(View.INVISIBLE);
                  bCancel.setVisibility(View.GONE);
                  mPinHdr.setText(R.string.pincode_enter_pin_code);
+                 mPinHdrExplanation.setVisibility(View.INVISIBLE);
                  setChangePincodeView(false);
               }
             
            }else {
             // pincode removal
               mPinHdr.setText(R.string.pincode_remove_your_pincode);
+              mPinHdrExplanation.setVisibility(View.INVISIBLE);
               pinCodeChecked = false;
               setChangePincodeView(true); 
            }
@@ -120,7 +123,8 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         }
         setTextListeners();
         
-        
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setIcon(DisplayUtils.getSeasonalIconId());
     }
     
 
@@ -136,6 +140,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         bCancel.setVisibility(View.INVISIBLE);
         bCancel.setVisibility(View.GONE);
         mPinHdr.setText(R.string.pincode_enter_pin_code);
+        mPinHdrExplanation.setVisibility(View.INVISIBLE);
     }
     
    
@@ -450,6 +455,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     
         clearBoxes(); 
         mPinHdr.setText(R.string.pincode_reenter_your_pincode); 
+        mPinHdrExplanation.setVisibility(View.INVISIBLE);        
         confirmingPinCode =true;
         
     }
@@ -493,6 +499,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             aDialog.show();
             clearBoxes(); 
             mPinHdr.setText(R.string.pincode_enter_pin_code);
+            mPinHdrExplanation.setVisibility(View.INVISIBLE);
             newPasswordEntered = true;
             confirmingPinCode = false;
             
@@ -537,6 +544,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             });
             aDialog.show();
             mPinHdr.setText(R.string.pincode_configure_your_pin);
+            mPinHdrExplanation.setVisibility(View.VISIBLE);
             clearBoxes();
         }