From: peli0101 <peli0101@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sun, 18 Jan 2009 00:36:13 +0000 (+0000)
Subject: OI Safe: Add default values to preferences.xml so a selection is shown the first... 
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=61dfabcac0a3e0fdfceda42a6c4e76187a05ff46;p=android-vcpass-oisafe

OI Safe: Add default values to preferences.xml so a selection is shown the first time.
Also clean up copyright notices in some .xml files.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1758 72b678ce-9140-0410-bee8-679b907dd61a
---

diff --git a/res/layout/dialog_allow_access.xml b/res/layout/dialog_allow_access.xml
index 725b4a6..ca15775 100644
--- a/res/layout/dialog_allow_access.xml
+++ b/res/layout/dialog_allow_access.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * Copyright (C) 2006-2008 Google Inc.
+ * Copyright (C) 2007-2009 OpenIntents.org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/res/layout/dialog_filename.xml b/res/layout/dialog_filename.xml
index c9b4bfa..afe7cee 100644
--- a/res/layout/dialog_filename.xml
+++ b/res/layout/dialog_filename.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * Copyright (C) 2006-2008 Google Inc.
+ * Copyright (C) 2007-2009 OpenIntents.org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 947d475..453eacd 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -26,7 +26,9 @@
             
         <CheckBoxPreference
                 android:title="@string/pref_title_external_access"
-                android:summary="@string/pref_summary_external_access" android:key="external_access"/>
+                android:summary="@string/pref_summary_external_access"
+                android:key="external_access"
+            	android:defaultValue="false"/>
                 
         <ListPreference
                 android:key="lock_timeout"
@@ -34,7 +36,8 @@
                 android:summary="@string/pref_summary_lock_timeout"
                 android:entries="@array/pref_entries_lock_timeout"
                 android:entryValues="@array/pref_entryvalues_lock_timeout"
-                android:dialogTitle="@string/pref_dialog_title_lock_timeout" />    
+                android:dialogTitle="@string/pref_dialog_title_lock_timeout"
+            	android:defaultValue="5" />    
 
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/org/openintents/safe/FrontDoor.java b/src/org/openintents/safe/FrontDoor.java
index 4d7ce4d..a15ff76 100644
--- a/src/org/openintents/safe/FrontDoor.java
+++ b/src/org/openintents/safe/FrontDoor.java
@@ -80,7 +80,7 @@ public class FrontDoor extends Activity {
 			switch (requestCode) {
 			case REQUEST_CODE_ASK_PASSWORD:
 				masterKey = data.getStringExtra("masterKey");
-				String timeout = mPreferences.getString("lock_timeout", "5"); 
+				String timeout = mPreferences.getString(Preferences.PREFERENCE_LOCK_TIMEOUT, Preferences.PREFERENCE_LOCK_TIMEOUT_DEFAULT_VALUE); 
 				int timeoutMinutes=5; // default to 5
 				try {
 					timeoutMinutes = Integer.valueOf(timeout);
diff --git a/src/org/openintents/safe/Preferences.java b/src/org/openintents/safe/Preferences.java
index 6161c64..7256b7f 100644
--- a/src/org/openintents/safe/Preferences.java
+++ b/src/org/openintents/safe/Preferences.java
@@ -6,6 +6,8 @@ import android.preference.PreferenceActivity;
 public class Preferences extends PreferenceActivity {
 
 	public static final String PREFERENCE_ALLOW_EXTERNAL_ACCESS = "external_access";
+	public static final String PREFERENCE_LOCK_TIMEOUT = "lock_timeout";
+	public static final String PREFERENCE_LOCK_TIMEOUT_DEFAULT_VALUE = "5";
 	
     @Override
     protected void onCreate(Bundle savedInstanceState) {