Merge "Update share UI to match redlines."

2 files changed, 4 insertions, 8 deletions

diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 76771c5..53f3e15 100644
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -759,9 +759,8 @@ public class PanoramaActivity extends Activity implements
         Uri uri = mThumbnail.getUri();
         if (mSharePopup == null || !uri.equals(mSharePopup.getUri())) {
             // The orientation compensation is set to 0 here because we only support landscape.
-            // Panorama picture is long. Use pano_layout so the share popup can be full-screen.
             mSharePopup = new SharePopup(this, uri, mThumbnail.getBitmap(), 0,
-                    findViewById(R.id.pano_layout));
+                    findViewById(R.id.frame_layout));
         }
         mSharePopup.showAtLocation(mThumbnailView, Gravity.NO_GRAVITY, 0, 0);
     }
diff --git a/src/com/android/camera/ui/SharePopup.java b/src/com/android/camera/ui/SharePopup.java
index cdc7756..4374d2d 100644
--- a/src/com/android/camera/ui/SharePopup.java
+++ b/src/com/android/camera/ui/SharePopup.java
@@ -59,7 +59,7 @@ public class SharePopup extends PopupWindow implements View.OnClickListener,
     private int mBitmapWidth;
     private int mBitmapHeight;
     private int mOrientation;
-    // A view that contains a thumbnail and an back arrow icon.
+    // A view that contains a thumbnail and an arrow icon.
     private ViewGroup mShareView;
     // A view that contains a list of application icons and the share view.
     private View mRootView;
@@ -114,11 +114,11 @@ public class SharePopup extends PopupWindow implements View.OnClickListener,
         sharePopup.setOnTouchListener(this);
         mThumbnailRotateLayout = (RotateLayout) sharePopup.findViewById(R.id.thumbnail_rotate_layout);
         mShareList = (ListView) sharePopup.findViewById(R.id.share_list);
+        mShareList.setDivider(null);
         mThumbnail = (ImageView) sharePopup.findViewById(R.id.thumbnail);
         mThumbnail.setImageBitmap(bitmap);
         mShareView = (ViewGroup) sharePopup.findViewById(R.id.share_view);
         mShareView.setOnClickListener(this);
-        sharePopup.findViewById(R.id.arrow).setOnClickListener(this);
         mBitmapWidth = bitmap.getWidth();
         mBitmapHeight = bitmap.getHeight();
         Resources res = mContext.getResources();
@@ -137,7 +137,7 @@ public class SharePopup extends PopupWindow implements View.OnClickListener,
         setContentView(sharePopup);
         setOrientation(orientation);
         setFocusable(true);
-        setAnimationStyle(android.R.style.Animation_Dialog);
+        setAnimationStyle(R.style.AnimationPopup);
         createShareMenu();
     }
 
@@ -200,9 +200,6 @@ public class SharePopup extends PopupWindow implements View.OnClickListener,
             case R.id.share_view:
                 Util.viewUri(mUri, mContext);
                 break;
-            case R.id.arrow:
-                dismiss();
-                break;
         }
     }