diff options
-rw-r--r-- | res/drawable/directions_button_background.xml | 14 | ||||
-rw-r--r-- | res/drawable/ic_generic_transport_icon.xml | 2 | ||||
-rw-r--r-- | res/drawable/request_ride_button_background.xml | 14 | ||||
-rw-r--r-- | res/layout/attachment_maps.xml | 47 | ||||
-rw-r--r-- | res/values/cm_dimens.xml | 2 | ||||
-rw-r--r-- | src/com/android/messaging/ui/conversation/ConversationMessageView.java | 15 | ||||
-rw-r--r-- | src/com/cyanogenmod/messaging/util/GoogleStaticMapsUtil.java | 2 |
7 files changed, 40 insertions, 56 deletions
diff --git a/res/drawable/directions_button_background.xml b/res/drawable/directions_button_background.xml index d7f56d6..a40b30f 100644 --- a/res/drawable/directions_button_background.xml +++ b/res/drawable/directions_button_background.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:colorControlHighlight"> - <item> - <shape android:shape="rectangle"> - <corners android:bottomLeftRadius="2dp" android:topLeftRadius="2dp" /> - <solid android:color="@color/white_54" /> - </shape> - </item> -</ripple>
\ No newline at end of file +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <corners android:bottomRightRadius="2dp" android:topRightRadius="2dp" /> + <solid android:color="@color/white_54" /> +</shape>
\ No newline at end of file diff --git a/res/drawable/ic_generic_transport_icon.xml b/res/drawable/ic_generic_transport_icon.xml index dd26431..7bd5e2e 100644 --- a/res/drawable/ic_generic_transport_icon.xml +++ b/res/drawable/ic_generic_transport_icon.xml @@ -21,7 +21,7 @@ android:viewportHeight="24"> <path - android:fillColor="@color/black_54" + android:fillColor="#000000" android:pathData="M18.9,6c-0.2-0.6-0.8-1-1.4-1h-11C5.8,5,5.3,5.4,5.1,6L3,12v8c0,0.5,0.5,1,1,1h1c0.6,0,1-0.5,1-1v-1h12v1c0,0.5,0.5,1,1,1h1 c0.5,0,1-0.5,1-1v-8L18.9,6z M6.5,16C5.7,16,5,15.3,5,14.5S5.7,13,6.5,13S8,13.7,8,14.5S7.3,16,6.5,16z M17.5,16 diff --git a/res/drawable/request_ride_button_background.xml b/res/drawable/request_ride_button_background.xml index d7f56d6..ff3ba2e 100644 --- a/res/drawable/request_ride_button_background.xml +++ b/res/drawable/request_ride_button_background.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:colorControlHighlight"> - <item> - <shape android:shape="rectangle"> - <corners android:bottomLeftRadius="2dp" android:topLeftRadius="2dp" /> - <solid android:color="@color/white_54" /> - </shape> - </item> -</ripple>
\ No newline at end of file +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <corners android:bottomLeftRadius="2dp" android:topLeftRadius="2dp" /> + <solid android:color="@color/white_54" /> +</shape>
\ No newline at end of file diff --git a/res/layout/attachment_maps.xml b/res/layout/attachment_maps.xml index aa5b353..4cb691f 100644 --- a/res/layout/attachment_maps.xml +++ b/res/layout/attachment_maps.xml @@ -21,46 +21,28 @@ android:layout_height="@dimen/conversation_maps_height"> <ImageView android:id="@+id/maps_image" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_width="@dimen/conversation_maps_width" + android:layout_height="@dimen/conversation_maps_height" android:minWidth="@dimen/conversation_maps_width" android:minHeight="@dimen/conversation_maps_height" android:adjustViewBounds="true" - android:scaleType="fitCenter" + android:scaleType="centerInside" android:layout_gravity="center_vertical"/> <RelativeLayout android:background="@drawable/maps_button_container_background" android:elevation="@dimen/maps_button_elevation" - android:layout_width="match_parent" + android:layout_width="@dimen/maps_button_width" android:layout_height="@dimen/maps_button_height" android:layout_alignParentBottom="true" android:layout_marginLeft="@dimen/conversation_maps_margin" android:layout_marginBottom="@dimen/conversation_maps_margin" - android:layout_marginRight="@dimen/conversation_maps_margin" - android:minWidth="@dimen/maps_button_width"> - - <ImageView - android:id="@+id/directions_button" - android:layout_width="@dimen/directions_button_width" - android:layout_height="match_parent" - android:background="@drawable/directions_button_background" - android:layout_alignParentRight="true" - android:padding="@dimen/directions_button_padding" - android:layout_centerVertical="true" - android:src="@drawable/ic_get_directions"/> - <View - android:id="@+id/button_divider" - android:layout_toLeftOf="@id/directions_button" - android:layout_width="@dimen/maps_button_divider_width" - android:layout_height="match_parent" - android:background="@color/transparent_gray" /> + android:layout_marginRight="@dimen/conversation_maps_margin"> <Button style="?android:attr/borderlessButtonStyle" android:id="@+id/request_ride_button" android:background="@drawable/request_ride_button_background" android:layout_alignParentLeft="true" - android:layout_toLeftOf="@id/button_divider" - android:layout_width="match_parent" + android:layout_width="@dimen/request_ride_button_width" android:layout_height="match_parent" android:paddingLeft="28dp" android:paddingRight="50dp" @@ -68,7 +50,6 @@ android:textSize="@dimen/request_ride_text_size" android:fontFamily="sans-serif-medium" android:text="@string/request_ride"/> - <ImageView android:id="@+id/brand_image" android:layout_width="@dimen/brand_image_width" @@ -80,5 +61,21 @@ android:focusable="false" android:clickable="false" android:src="@drawable/ic_generic_transport_icon"/> + <ImageView + android:id="@+id/directions_button" + android:layout_width="@dimen/directions_button_width" + android:layout_height="match_parent" + android:background="@drawable/directions_button_background" + android:layout_alignParentRight="true" + android:padding="@dimen/directions_button_padding" + android:layout_centerVertical="true" + android:src="@drawable/ic_get_directions"/> + <View + android:id="@+id/button_divider" + android:layout_toRightOf="@id/request_ride_button" + android:layout_toLeftOf="@id/directions_button" + android:layout_width="@dimen/maps_button_divider_width" + android:layout_height="match_parent" + android:background="@color/transparent_gray" /> </RelativeLayout> </RelativeLayout>
\ No newline at end of file diff --git a/res/values/cm_dimens.xml b/res/values/cm_dimens.xml index 9ce1bf5..f367e0c 100644 --- a/res/values/cm_dimens.xml +++ b/res/values/cm_dimens.xml @@ -38,6 +38,4 @@ <dimen name="maps_error_icon_width">1dp</dimen> <dimen name="maps_error_icon_height">1dp</dimen> <dimen name="maps_corner_radius">3dp</dimen> - <dimen name="map_request_width">221px</dimen> - <dimen name="map_request_height">144px</dimen> </resources> 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="; |