Merge "Fix hard coded values for Maserati HVAC in Embedded Kitchen Sink" into nyc-car-dev
diff --git a/car-support-lib/res/layout/car_menu_list_item.xml b/car-support-lib/res/layout/car_menu_list_item.xml
index 5bcc14c..312e7a3 100644
--- a/car-support-lib/res/layout/car_menu_list_item.xml
+++ b/car-support-lib/res/layout/car_menu_list_item.xml
@@ -67,7 +67,7 @@
</LinearLayout>
<ViewStub
android:id="@+id/right_item"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/car_list_item_right_icon_size"
+ android:layout_height="@dimen/car_list_item_right_icon_size"
android:layout_gravity="center_vertical" />
</LinearLayout>
diff --git a/car-support-lib/res/raw/ic_chevron_right.svg b/car-support-lib/res/raw/ic_chevron_right.svg
deleted file mode 100644
index 7a9911c..0000000
--- a/car-support-lib/res/raw/ic_chevron_right.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <!-- Generator: Sketch 3.7 (28169) - http://www.bohemiancoding.com/sketch -->
- <title>ic_chevron_right</title>
- <desc>Created with Sketch.</desc>
- <defs></defs>
- <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <g id="ic_chevron_right">
- <g id="night">
- <polygon id="Shape" fill="#212121" points="10 6 8.59 7.41 13.17 12 8.59 16.59 10 18 16 12"></polygon>
- <polygon id="Shape" points="0 0 24 0 24 24 0 24"></polygon>
- </g>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/car-support-lib/res/values-w1024dp/dimens.xml b/car-support-lib/res/values-w1024dp/dimens.xml
index afe1562..bef06ee 100644
--- a/car-support-lib/res/values-w1024dp/dimens.xml
+++ b/car-support-lib/res/values-w1024dp/dimens.xml
@@ -29,7 +29,7 @@
<dimen name="car_card_margin">228dp</dimen>
- <dimen name="car_list_item_icon_size">124dp</dimen>
+ <dimen name="car_list_item_icon_size">108dp</dimen>
<dimen name="car_list_item_small_icon_size">56dp</dimen>
<dimen name="car_list_item_right_icon_size">56dp</dimen>
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/touch/TouchPointView.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/touch/TouchPointView.java
index 4bf5be6..dd3eabb 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/touch/TouchPointView.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/touch/TouchPointView.java
@@ -22,6 +22,7 @@
import android.graphics.Paint;
import android.graphics.Point;
import android.util.AttributeSet;
+import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
@@ -32,6 +33,8 @@
@SuppressWarnings("unused")
private static final String TAG = TouchPointView.class.getSimpleName();
+ private static final boolean LOG_ONLY = true;
+
private final int[] mColors = {
Color.RED,
Color.GREEN,
@@ -58,6 +61,10 @@
@Override
public boolean onTouchEvent(MotionEvent event) {
+ if (LOG_ONLY) {
+ logTouchEvents(event);
+ return true;
+ }
mFingers.clear();
if (event.getActionMasked() == MotionEvent.ACTION_UP) {
invalidate();
@@ -76,8 +83,27 @@
return true;
}
+ private void logTouchEvents(MotionEvent event) {
+ if (event.getActionMasked() != MotionEvent.ACTION_UP) {
+ return;
+ }
+
+ for (int i = 0; i < event.getPointerCount(); i++) {
+ int pointerId = event.getPointerId(i);
+ int pointerIndex = event.findPointerIndex(pointerId);
+ long downTime = event.getDownTime();
+ long eventTime = event.getEventTime();
+ Log.d(TAG, "TouchUp [x=" + event.getX(pointerIndex) + ", y=" + event.getY(pointerIndex) +
+ " , pointerId=" + pointerId + ", pointerIndex=" + pointerIndex + ", duration=" +
+ (eventTime - downTime) + "]");
+ }
+ }
+
@Override
public void onDraw(Canvas canvas) {
+ if (LOG_ONLY) {
+ return;
+ }
int radius = canvas.getWidth() / 20;
for (int i = 0; i < mFingers.size(); i++) {
Finger finger = mFingers.get(i);
