commit 55f4f73618849a538da61df59f9f22e27d12ecdf
author Adam Lesinski <adamlesinski@google.com> Wed Dec 15 23:57:09 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 15 23:57:09 2010 -0800
tree 66619c916961ebd9b8152a4b7efee2917fd99d48
parent 4ecb7028746a36c4febb831ba30a07d353e89e16
parent 3eeaf2885ff4fc32c422f8d5b3801581dbf40f0b

Merge "Updated widget preview"

res/layout/navigation_bar.xml

diff --git a/res/layout/navigation_bar.xml b/res/layout/navigation_bar.xml
index 088c192..e40a00e 100644
--- a/res/layout/navigation_bar.xml
+++ b/res/layout/navigation_bar.xml
@@ -40,6 +40,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="left|center_vertical"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
         android:minWidth="220dip" >
         <ImageView
             android:id="@+id/icon"

src/com/android/contacts/editor/ContactEditorFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 96ba499..df748ae 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -40,7 +40,6 @@
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.Fragment;
-import android.app.FragmentManager;
 import android.app.LoaderManager;
 import android.app.LoaderManager.LoaderCallbacks;
 import android.content.ActivityNotFoundException;