bug 696062 - Clear History r=mfinkle

--HG--
extra : rebase_source : fec8263b6b33c25bc065ab5650f2c47778a8b4ff

embedding/android/ConfirmPreference.java

@@ -0,0 +1,68 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Android code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2009-2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Brad Lassey <blassey@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.gecko;
+import android.preference.*;
+import android.content.*;
+import android.util.*;
+import android.provider.Browser;
+
+class ConfirmPreference extends DialogPreference {
+    String mAction = null;
+    Context mContext = null;
+    public ConfirmPreference(Context context, AttributeSet attrs) {
+	super(context, attrs);
+	mAction = attrs.getAttributeValue(null, "action");
+	mContext = context;
+    }
+    public ConfirmPreference(Context context, AttributeSet attrs, int defStyle) {
+	super(context, attrs, defStyle);
+	mAction = attrs.getAttributeValue(null, "action");
+	mContext = context;
+    }
+    protected void onDialogClosed(boolean positiveResult) {
+	if (!positiveResult)
+	    return;
+	if ("clear_history".equalsIgnoreCase(mAction)) {
+	    GeckoAppShell.getHandler().post(new Runnable(){
+		    public void run() {
+			Browser.clearHistory(mContext.getContentResolver());
+		    }});
+	}
+	Log.i("GeckoPref", "action: " + mAction);
+    }
+}

embedding/android/Makefile.in

@@ -66,6 +66,7 @@ JAVAFILES = \
   DoorHanger.java \
   DoorHangerPopup.java \
   GlobalHistory.java \
+  ConfirmPreference.java \
   $(NULL)
 
 PROCESSEDJAVAFILES = \

embedding/android/locales/en-US/android_strings.dtd

@@ -57,3 +57,7 @@
 
 <!ENTITY share "Share">
 <!ENTITY saveaspdf "Save as PDF">
+
+<!ENTITY pref_category_history "History">
+<!ENTITY pref_clear_history "Clear history">
+<!ENTITY pref_clear_history_confirm "Browsing history will be deleted">

embedding/android/resources/xml/preferences.xml

@@ -37,6 +37,13 @@
 
     <PreferenceCategory android:title="@string/pref_category_privacy">
 
+      <org.mozilla.gecko.ConfirmPreference 
+	  android:title="@string/pref_clear_history"
+	  android:dialogMessage="@string/pref_clear_history_confirm"
+	  android:positiveButtonText="@android:string/yes"
+	  android:negativeButtonText="@android:string/no"
+	  action="clear_history" />
+
         <CheckBoxPreference android:key="privacy.donottrackheader.enabled"
                             android:title="@string/pref_do_not_track"
                             android:defaultValue="false"

embedding/android/strings.xml.in

@@ -61,4 +61,7 @@
 
   <string name="reload">&reload;</string>
   <string name="new_tab">&new_tab;</string>
+  <string name="pref_category_history">&pref_category_history;</string>
+  <string name="pref_clear_history">&pref_clear_history;</string>
+  <string name="pref_clear_history_confirm">&pref_clear_history_confirm;</string>
 </resources>