diff options
| author | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-19 11:15:57 +0800 |
|---|---|---|
| committer | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-19 11:20:39 +0800 |
| commit | b90b47d6f6900842ce3d40d7106c43a7319a55c3 (patch) | |
| tree | 6a9efdd7779fe76d6133c7b12a68012740d919a9 /src/com | |
| parent | d6cb136095984e6cc002685d99719fe8acf0f65c (diff) | |
| download | android_packages_apps_Messaging-b90b47d6f6900842ce3d40d7106c43a7319a55c3.tar.gz android_packages_apps_Messaging-b90b47d6f6900842ce3d40d7106c43a7319a55c3.tar.bz2 android_packages_apps_Messaging-b90b47d6f6900842ce3d40d7106c43a7319a55c3.zip | |
Revert "Adjust map and map bar UX"
Getting rid of dependencies on the ambient SDK.
This reverts commit c0de5d0cf1c44664fcfd9adf0568ac137c215512.
Change-Id: Ic362df39edf25d34f1b4cd9f83d664750697d3f7
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/messaging/ui/conversation/ConversationMessageView.java | 15 | ||||
| -rw-r--r-- | src/com/cyanogenmod/messaging/util/GoogleStaticMapsUtil.java | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/com/android/messaging/ui/conversation/ConversationMessageView.java b/src/com/android/messaging/ui/conversation/ConversationMessageView.java index bf82983..54c18d5 100644 --- a/src/com/android/messaging/ui/conversation/ConversationMessageView.java +++ b/src/com/android/messaging/ui/conversation/ConversationMessageView.java @@ -693,12 +693,9 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick */ private void showMapsPreview(String mapsUrlString, String mapsUrlPrefix, int desiredWidth) { final int unspecifiedMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); - final int mapsWidthMeasureSpec = MeasureSpec.makeMeasureSpec(desiredWidth, + final int mapsMeasureSpec = MeasureSpec.makeMeasureSpec(desiredWidth, MeasureSpec.EXACTLY); - final int mapsHeightMeasureSpec = MeasureSpec.makeMeasureSpec(getResources() - .getDimensionPixelSize(R.dimen.conversation_maps_height), MeasureSpec.EXACTLY); - - mMessageMapsView.measure(mapsWidthMeasureSpec, mapsHeightMeasureSpec); + mMessageMapsView.measure(mapsMeasureSpec, unspecifiedMeasureSpec); // Reset view visibility to gone mRequestRideButton.setVisibility(View.GONE); @@ -707,10 +704,10 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick mButtonDivider.setVisibility(View.GONE); final String encodedAddress = mapsUrlString.substring(mapsUrlPrefix.length()); - - String staticMapsUrl = GoogleStaticMapsUtil.getStaticMapsUrl(mContext, - getResources().getDimensionPixelSize(R.dimen.map_request_width), - getResources().getDimensionPixelSize(R.dimen.map_request_height), encodedAddress); + final int height = getResources() + .getDimensionPixelSize(R.dimen.conversation_maps_height); + String staticMapsUrl = GoogleStaticMapsUtil.getStaticMapsUrl(mContext, desiredWidth, + height, encodedAddress); RoundedCornerTransformation transformation = new RoundedCornerTransformation(mContext.getApplicationContext(), staticMapsUrl); Picasso.with(mContext.getApplicationContext()) diff --git a/src/com/cyanogenmod/messaging/util/GoogleStaticMapsUtil.java b/src/com/cyanogenmod/messaging/util/GoogleStaticMapsUtil.java index cb1b0c7..a88dfb0 100644 --- a/src/com/cyanogenmod/messaging/util/GoogleStaticMapsUtil.java +++ b/src/com/cyanogenmod/messaging/util/GoogleStaticMapsUtil.java @@ -27,7 +27,7 @@ public class GoogleStaticMapsUtil { private static final String X = "x"; private static final String SIZE = "size="; - private static final String ZOOM = "zoom=17"; + private static final String ZOOM = "zoom=18"; private static final String SCALE = "scale=4"; private static final String API_KEY = "key="; |