Backing out this change for the Droid on suspicion that it's interfering with at...

[zxing.git] / android / src / com / google / zxing / client / android / Contents.java

diff --git a/android/src/com/google/zxing/client/android/Contents.java b/android/src/com/google/zxing/client/android/Contents.java
index 04470aa..3080ecd 100755 (executable)
--- a/android/src/com/google/zxing/client/android/Contents.java
+++ b/android/src/com/google/zxing/client/android/Contents.java
@@ -18,26 +18,16 @@ package com.google.zxing.client.android;
 
 import android.provider.Contacts;
 
+/**
+ * The set of constants to use when sending Barcode Scanner an Intent which requests a barcode
+ * to be encoded.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
 public final class Contents {
-
   private Contents() {
   }
 
-  /**
-   * All the formats we know about.
-   */
-  public static final class Format {
-    public static final String UPC_A = "UPC_A";
-    public static final String UPC_E = "UPC_E";
-    public static final String EAN_8 = "EAN_8";
-    public static final String EAN_13 = "EAN_13";
-    public static final String CODE_39 = "CODE_39";
-    public static final String CODE_128 = "CODE_128";
-    public static final String QR_CODE = "QR_CODE";
-    private Format() {
-    }
-  }
-
   public static final class Type {
     /**
      * Plain text. Use Intent.putExtra(DATA, string). This can be used for URLs too, but string
@@ -89,24 +79,19 @@ public final class Contents {
     }
   }
 
-  // These are new constants in Contacts.Intents.Insert for Android 1.1.
-  // TODO: Remove these constants once we can build against the 1.1 SDK.
-  private static final String SECONDARY_PHONE = "secondary_phone";
-  private static final String TERTIARY_PHONE = "tertiary_phone";
-  private static final String SECONDARY_EMAIL = "secondary_email";
-  private static final String TERTIARY_EMAIL = "tertiary_email";
-
-
   /**
    * When using Type.CONTACT, these arrays provide the keys for adding or retrieving multiple
    * phone numbers and addresses.
    */
   public static final String[] PHONE_KEYS = {
-      Contacts.Intents.Insert.PHONE, SECONDARY_PHONE, TERTIARY_PHONE
+      Contacts.Intents.Insert.PHONE,
+      Contacts.Intents.Insert.SECONDARY_PHONE,
+      Contacts.Intents.Insert.TERTIARY_PHONE
   };
 
   public static final String[] EMAIL_KEYS = {
-      Contacts.Intents.Insert.EMAIL, SECONDARY_EMAIL, TERTIARY_EMAIL
+      Contacts.Intents.Insert.EMAIL,
+      Contacts.Intents.Insert.SECONDARY_EMAIL,
+      Contacts.Intents.Insert.TERTIARY_EMAIL
   };
-
 }