Merge "Simplify IM types to be consistent with Exchange"
diff --git a/res/layout-xlarge/item_group_membership.xml b/res/layout-xlarge/item_group_membership.xml
index d0b393f..196e767 100644
--- a/res/layout-xlarge/item_group_membership.xml
+++ b/res/layout-xlarge/item_group_membership.xml
@@ -41,6 +41,7 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:gravity="left"
         android:ellipsize="end"
+        android:focusable="true"
     />
 
     <!-- Plus/Minus button only for layout. This makes the editor lay out nicely with the other fields -->
diff --git a/res/layout/item_group_membership.xml b/res/layout/item_group_membership.xml
index b349390..3e4db8c 100644
--- a/res/layout/item_group_membership.xml
+++ b/res/layout/item_group_membership.xml
@@ -49,7 +49,8 @@
             android:textColor="@color/kind_title"
             android:singleLine="true"
             android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
+            android:fadingEdge="horizontal"
+            android:focusable="true" />
 
     </LinearLayout>
 
diff --git a/src/com/android/contacts/views/editor/LabeledEditorView.java b/src/com/android/contacts/views/editor/LabeledEditorView.java
index 1cedef7..41e0173 100644
--- a/src/com/android/contacts/views/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/views/editor/LabeledEditorView.java
@@ -142,6 +142,7 @@
             mLabel.setLayoutParams(new LayoutParams(width, LayoutParams.WRAP_CONTENT));
             mLabel.setGravity(Gravity.RIGHT);
             mLabel.setTextColor(getResources().getColor(R.color.editor_label_text_color));
+            mLabel.setFocusable(true);
             mLabel.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
diff --git a/src/com/android/contacts/views/editor/TextFieldsEditorView.java b/src/com/android/contacts/views/editor/TextFieldsEditorView.java
index daade45..74b75ba 100644
--- a/src/com/android/contacts/views/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/views/editor/TextFieldsEditorView.java
@@ -28,7 +28,6 @@
 import android.content.Entity;
 import android.content.res.Resources;
 import android.graphics.Rect;
-import android.os.Handler;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.telephony.PhoneNumberFormattingTextWatcher;