commit ff16eea0e4d18cf2964667ce8e597780797e2b69
author Walter Jang <wjang@google.com> Mon Mar 16 13:35:08 2015 -0700
committer Walter Jang <wjang@google.com> Mon Mar 16 23:49:30 2015 +0000
tree 3760d4f343914b1af3dfb5af78a322d725116531
parent 9d8f37e77052543c4ae07cbf8329e4ff0ddef66b

Move contact photo edit icon from ActionBar to lower right corner

Screenshots https://docs.google.com/drawings/d/1mekRSq4i3Y810Ow2tbNBDKBWl1NGmR4GLR7vlocZOxI/edit

Bug 19732687

Change-Id: I68f969eed59d925d9afd6d5c8e33ec80cbff5cfd

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

diff --git a/src/com/android/contacts/editor/CompactPhotoEditorView.java b/src/com/android/contacts/editor/CompactPhotoEditorView.java
index 6c8670d..ef96854 100644
--- a/src/com/android/contacts/editor/CompactPhotoEditorView.java
+++ b/src/com/android/contacts/editor/CompactPhotoEditorView.java
@@ -44,12 +44,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 
 /**
  * Displays the primary photo.
  */
-public class CompactPhotoEditorView extends LinearLayout implements View.OnClickListener {
+public class CompactPhotoEditorView extends RelativeLayout implements View.OnClickListener {
 
     private static final String TAG = CompactContactEditorFragment.TAG;
 
@@ -90,7 +90,7 @@
         mContactPhotoManager = ContactPhotoManager.getInstance(getContext());
 
         mPhotoImageView = (QuickContactImageView) findViewById(R.id.photo);
-        mPhotoImageView.setOnClickListener(this);
+        findViewById(R.id.photo_touch_intercept_overlay).setOnClickListener(this);
     }
 
     public void setValues(DataKind dataKind, ValuesDelta valuesDelta,