1 files changed, 26 insertions, 20 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
index b55075e6c..24e8ff4c7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java
@@ -56,28 +56,33 @@ public class ActionBarHelper {
      * Sets custom view on ActionBar for Done/Cancel activities
      * 
      * @param actionBar
-     * @param doneText
-     * @param doneOnClickListener
-     * @param cancelText
-     * @param cancelOnClickListener
+     * @param firstText
+     * @param firstDrawableId
+     * @param firstOnClickListener
+     * @param secondText
+     * @param secondDrawableId
+     * @param secondOnClickListener
      */
-    public static void setDoneCancelView(ActionBar actionBar, int doneText,
-            OnClickListener doneOnClickListener, int cancelText,
-            OnClickListener cancelOnClickListener) {
+    public static void setTwoButtonView(ActionBar actionBar, int firstText, int firstDrawableId,
+            OnClickListener firstOnClickListener, int secondText, int secondDrawableId,
+            OnClickListener secondOnClickListener) {
 
-        // Inflate a "Done"/"Cancel" custom action bar view
+        // Inflate the custom action bar view
         final LayoutInflater inflater = (LayoutInflater) actionBar.getThemedContext()
                 .getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
         final View customActionBarView = inflater.inflate(
                 R.layout.actionbar_custom_view_done_cancel, null);
 
-        ((TextView) customActionBarView.findViewById(R.id.actionbar_done_text)).setText(doneText);
+        TextView firstTextView = ((TextView) customActionBarView.findViewById(R.id.actionbar_done_text));
+        firstTextView.setText(firstText);
+        firstTextView.setCompoundDrawablesWithIntrinsicBounds(firstDrawableId, 0, 0, 0);
         customActionBarView.findViewById(R.id.actionbar_done).setOnClickListener(
-                doneOnClickListener);
-        ((TextView) customActionBarView.findViewById(R.id.actionbar_cancel_text))
-                .setText(cancelText);
+                firstOnClickListener);
+        TextView secondTextView = ((TextView) customActionBarView.findViewById(R.id.actionbar_cancel_text));
+        secondTextView.setText(secondText);
+        secondTextView.setCompoundDrawablesWithIntrinsicBounds(secondDrawableId, 0, 0, 0);
         customActionBarView.findViewById(R.id.actionbar_cancel).setOnClickListener(
-                cancelOnClickListener);
+                secondOnClickListener);
 
         // Show the custom action bar view and hide the normal Home icon and title.
         actionBar.setDisplayShowTitleEnabled(false);
@@ -91,20 +96,22 @@ public class ActionBarHelper {
      * Sets custom view on ActionBar for Done activities
      * 
      * @param actionBar
-     * @param doneText
-     * @param doneOnClickListener
+     * @param firstText
+     * @param firstOnClickListener
      */
-    public static void setDoneView(ActionBar actionBar, int doneText,
-            OnClickListener doneOnClickListener) {
+    public static void setOneButtonView(ActionBar actionBar, int firstText, int firstDrawableId,
+            OnClickListener firstOnClickListener) {
         // Inflate a "Done" custom action bar view to serve as the "Up" affordance.
         final LayoutInflater inflater = (LayoutInflater) actionBar.getThemedContext()
                 .getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
         final View customActionBarView = inflater
                 .inflate(R.layout.actionbar_custom_view_done, null);
 
-        ((TextView) customActionBarView.findViewById(R.id.actionbar_done_text)).setText(doneText);
+        TextView firstTextView = ((TextView) customActionBarView.findViewById(R.id.actionbar_done_text));
+        firstTextView.setText(firstText);
+        firstTextView.setCompoundDrawablesWithIntrinsicBounds(firstDrawableId, 0, 0, 0);
         customActionBarView.findViewById(R.id.actionbar_done).setOnClickListener(
-                doneOnClickListener);
+                firstOnClickListener);
 
         // Show the custom action bar view and hide the normal Home icon and title.
         actionBar.setDisplayShowTitleEnabled(false);
@@ -112,5 +119,4 @@ public class ActionBarHelper {
         actionBar.setDisplayShowCustomEnabled(true);
         actionBar.setCustomView(customActionBarView);
     }
-
 }