Bug 1017633 - Update "Clear history" dialog button and add telemetry. r=mfinkle

mobile/android/base/home/MostRecentPanel.java

@@ -150,7 +150,7 @@ public class MostRecentPanel extends HomeFragment {
                     }
                 });
 
-                dialogBuilder.setPositiveButton(R.string.button_yes, new AlertDialog.OnClickListener() {
+                dialogBuilder.setPositiveButton(R.string.button_ok, new AlertDialog.OnClickListener() {
                     @Override
                     public void onClick(final DialogInterface dialog, final int which) {
                         dialog.dismiss();
@@ -161,6 +161,8 @@ public class MostRecentPanel extends HomeFragment {
                                 BrowserDB.clearHistory(cr);
                             }
                         });
+
+                        Telemetry.sendUIEvent(TelemetryContract.Event.SANITIZE, TelemetryContract.Method.BUTTON, "history");
                     }
                 });
 

mobile/android/base/preferences/PrivateDataPreference.java

@@ -32,7 +32,7 @@ class PrivateDataPreference extends MultiChoicePreference {
         if (!positiveResult)
             return;
 
-        Telemetry.sendUIEvent(TelemetryContract.Event.SANITIZE, TelemetryContract.Method.DIALOG);
+        Telemetry.sendUIEvent(TelemetryContract.Event.SANITIZE, TelemetryContract.Method.DIALOG, "settings");
 
         CharSequence keys[] = getEntryKeys();
         boolean values[] = getValues();