summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml6
-rw-r--r--res/layout/quickdoc.xml45
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/xml/prefs.xml5
-rw-r--r--src/net/hoopajoo/android/SoftKeys/Keys.java12
-rw-r--r--src/net/hoopajoo/android/SoftKeys/Prefs.java16
-rw-r--r--src/net/hoopajoo/android/SoftKeys/QuickDoc.java81
7 files changed, 168 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1ed3689..85ac68a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -46,6 +46,12 @@
android:label="@string/app_name">
</activity>
+ <activity android:name=".QuickDoc"
+ android:label="@string/app_name"
+ android:configChanges="orientation|keyboardHidden"
+ android:theme="@android:style/Theme.Dialog">
+ </activity>
+
<service android:name=".SoftKeysService"/>
</application>
<uses-sdk android:minSdkVersion="4" />
diff --git a/res/layout/quickdoc.xml b/res/layout/quickdoc.xml
new file mode 100644
index 0000000..a0caf03
--- /dev/null
+++ b/res/layout/quickdoc.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Copyright (c) 2010 Steve Slaven
+
+ 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.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ >
+
+<LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_weight="1">
+<WebView
+ android:id="@+id/webview"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+ </LinearLayout>
+
+<Button
+ android:id="@+id/exit"
+ android:text="@string/quickdoc_exit"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:onClick="closeHelp"
+ />
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 99fbf47..36cde24 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,6 +3,7 @@
<string name="app_name">SoftKeys</string>
<string name="recent_tasks_title">Recent Tasks:</string>
+ <string name="quickdoc_exit">Close</string>
<string name="pref_category_service_title">SoftKeys Service</string>
<string name="pref_service_title">Run Service</string>
@@ -52,6 +53,8 @@
<string name="pref_author_summary">Steve Slaven &lt;bpk@hoopajoo.net&gt;</string>
<string name="pref_url_title">Website</string>
<string name="pref_url_summary">http://hoopajoo.net/</string>
+ <string name="pref_help_title">Help</string>
+ <string name="pref_help_summary">View Included Help</string>
<string name="pref_category_visual_title">Visuals and Layout</string>
<string name="pref_theme_title">Theme</string>
diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index 8a71b27..fff8425 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -256,6 +256,11 @@
<PreferenceCategory
android:title="@string/pref_category_info_title">
+
+ <Preference
+ android:key="pref_help"
+ android:title="@string/pref_help_title"
+ android:summary="@string/pref_help_summary" />
<Preference
android:key="pref_version"
diff --git a/src/net/hoopajoo/android/SoftKeys/Keys.java b/src/net/hoopajoo/android/SoftKeys/Keys.java
index 451fdd0..2724451 100644
--- a/src/net/hoopajoo/android/SoftKeys/Keys.java
+++ b/src/net/hoopajoo/android/SoftKeys/Keys.java
@@ -34,6 +34,7 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
+import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
@@ -360,6 +361,17 @@ public class Keys extends Activity implements OnClickListener, OnLongClickListen
// simulate wake
isPaused = true;
onNewIntent( getIntent() );
+
+ // what's new/getting started?
+ int force_level = 2010122701;
+ if( settings.getInt( "last_intro_level", 0 ) < force_level ) {
+ Intent intent = new Intent( this, QuickDoc.class );
+ intent.putExtra( "type", "getting_started" );
+ startActivity( intent );
+ SharedPreferences.Editor e = settings.edit();
+ e.putInt( "last_intro_level", force_level );
+ e.commit();
+ }
}
diff --git a/src/net/hoopajoo/android/SoftKeys/Prefs.java b/src/net/hoopajoo/android/SoftKeys/Prefs.java
index 5954376..4a93b15 100644
--- a/src/net/hoopajoo/android/SoftKeys/Prefs.java
+++ b/src/net/hoopajoo/android/SoftKeys/Prefs.java
@@ -30,6 +30,7 @@ import android.os.Bundle;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
+import android.preference.Preference.OnPreferenceClickListener;
public class Prefs extends PreferenceActivity {
/** Called when the activity is first created. */
@@ -58,6 +59,21 @@ public class Prefs extends PreferenceActivity {
Preference version = (Preference)findPreference( "pref_version" );
version.setSummary( getString( R.string.pref_version_summary, ver ) );
+
+ findPreference( "pref_help" )
+ .setOnPreferenceClickListener(new OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ triggerHelp();
+ return false;
+ }
+ } );
+ }
+
+ private void triggerHelp() {
+ Intent intent = new Intent( this, QuickDoc.class );
+ intent.putExtra( "type", "help" );
+ startActivity( intent );
}
private void fillListFromIntent( ListPreference l, Intent i, String firstItem, String firstValue ) {
diff --git a/src/net/hoopajoo/android/SoftKeys/QuickDoc.java b/src/net/hoopajoo/android/SoftKeys/QuickDoc.java
new file mode 100644
index 0000000..2f8323a
--- /dev/null
+++ b/src/net/hoopajoo/android/SoftKeys/QuickDoc.java
@@ -0,0 +1,81 @@
+/*
+ *
+ * Copyright (c) 2010 Steve Slaven
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+*/
+package net.hoopajoo.android.SoftKeys;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.webkit.WebView;
+import android.widget.Button;
+
+public class QuickDoc extends Activity {
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.quickdoc);
+
+ String url = "file:///android_asset/";
+
+ Intent i = getIntent();
+ if( i != null ) {
+ Bundle ex = i.getExtras();
+ String type = ex.getString( "type" );
+ if( type.equals( "getting_started" ) ) {
+ url += "getting_started.html";
+ }else if( type.equals( "help" ) ) {
+ url += "help.html";
+ }else{
+ url += "404.html";
+ }
+ }
+
+ WebView mWebView = (WebView) findViewById(R.id.webview);
+ mWebView.getSettings().setJavaScriptEnabled( false );
+ mWebView.loadUrl( url );
+
+ /*
+ String ver = "unknown";
+ try {
+ PackageInfo info = getPackageManager().getPackageInfo( "net.hoopajoo.android.SoftKeys", PackageManager.GET_META_DATA );
+ ver = info.versionName;
+ }catch( Exception e ) {
+ }
+
+ Preference version = (Preference)findPreference( "pref_version" );
+ version.setSummary( getString( R.string.pref_version_summary, ver ) );
+ */
+ }
+
+ public void closeHelp( View v ) {
+ this.finish();
+ }
+}