Version Menu Added to Settings
Change-Id: I9d72a0a16234c5b35c52513b1278390242b62a59
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7227c07..4a02a1c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1110,4 +1110,5 @@
<!-- SWE Android Browser -->
<string name="ssl_certificate">Security certificate</string>
<string name="ssl_certificate_is_valid">This certificate is valid.</string>
+ <string name="version">Version</string>
</resources>
\ No newline at end of file
diff --git a/res/xml/about_preferences.xml b/res/xml/about_preferences.xml
new file mode 100644
index 0000000..399d0c0
--- /dev/null
+++ b/res/xml/about_preferences.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2014, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <PreferenceCategory>
+ <Preference android:key="about_preference"/>
+ </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/preference_headers.xml b/res/xml/preference_headers.xml
index 484d305..244a270 100644
--- a/res/xml/preference_headers.xml
+++ b/res/xml/preference_headers.xml
@@ -40,4 +40,8 @@
android:title="@string/pref_lab_title"
/>
+ <header android:fragment="com.android.swe.browser.preferences.AboutPreferencesFragment"
+ android:title="@string/version"
+ />
+
</preference-headers>
diff --git a/src/com/android/swe/browser/Controller.java b/src/com/android/swe/browser/Controller.java
index 79b93e2..8f3aeb4 100644
--- a/src/com/android/swe/browser/Controller.java
+++ b/src/com/android/swe/browser/Controller.java
@@ -2101,25 +2101,6 @@
}
break;
- case R.id.about_menu_id:
- {
- /* SWE_TODO: Un-comment below to fix About
- final Dialog dialog = new AlertDialog.Builder(getActivity())
- .setTitle(R.string.application_name)
- .setMessage(R.string.about_text)
- .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.cancel();
- }
- })
- .show();
- ((TextView)dialog.findViewById(android.R.id.message))
- .setMovementMethod(LinkMovementMethod.getInstance());
- */
- }
- break;
-
default:
return false;
}
diff --git a/src/com/android/swe/browser/preferences/AboutPreferencesFragment.java b/src/com/android/swe/browser/preferences/AboutPreferencesFragment.java
new file mode 100644
index 0000000..6b12597
--- /dev/null
+++ b/src/com/android/swe/browser/preferences/AboutPreferencesFragment.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2014, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package com.android.swe.browser.preferences;
+
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceFragment;
+import com.android.swe.browser.R;
+
+public class AboutPreferencesFragment extends PreferenceFragment
+ implements OnPreferenceClickListener {
+
+ static final String PREF_ABOUT = "about_preference";
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ addPreferencesFromResource(R.xml.about_preferences);
+ Preference aboutPreference = (Preference) findPreference(PREF_ABOUT);
+ String about_text = getString(R.string.about_text);
+ about_text = about_text.substring(about_text.indexOf("Hash"), about_text.length());
+ aboutPreference.setSummary(about_text);
+ }
+
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ return false;
+ }
+}