summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorRakesh Iyer <rni@google.com>2017-04-14 13:40:38 -0700
committerRakesh Iyer <rni@google.com>2017-04-14 13:43:18 -0700
commit292426df297a9137cded7808ac4dfdb3d532d1f0 (patch)
treef0096b5f1722f34dbf0f1e4d7b6d5acf2302ec47 /res
parent2575070e9de72bde07e5bc1c7ece95bd7f78ac27 (diff)
downloadMedia-292426df297a9137cded7808ac4dfdb3d532d1f0.tar.gz
Fix up tap target heights.
The tap targets are really big and are getting really close to the seek bar. Reduce the size a little to avoid mistriggers. Also, the default dimens file was missing a bunch of resources which could cause the application to crash because it wouldn't find a resource at some resolutions. Put in placeholder numbers for those. Bug: 36191136 Test: Looked at the layout bounds with show layout bounds enabled and made sure they look reasonable. Change-Id: Id55f397acb8e751a75978b100051f34e6c5eb2dd
Diffstat (limited to 'res')
-rw-r--r--res/layout/media_controls.xml2
-rw-r--r--res/values-w1024dp/dimens.xml5
-rw-r--r--res/values/dimens.xml6
3 files changed, 8 insertions, 5 deletions
diff --git a/res/layout/media_controls.xml b/res/layout/media_controls.xml
index 2adb98a..133757d 100644
--- a/res/layout/media_controls.xml
+++ b/res/layout/media_controls.xml
@@ -56,7 +56,7 @@ limitations under the License.
<FrameLayout
android:id="@+id/play_pause_container"
android:layout_width="@dimen/controls_tap_target_width"
- android:layout_height="@dimen/controls_tap_target_height">
+ android:layout_height="wrap_content">
<com.android.car.media.util.widgets.PlayPauseStopImageView
android:id="@+id/play_pause"
android:layout_width="@dimen/stream_fab_size"
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index 0ecc751..5aa13ce 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -32,10 +32,7 @@
<dimen name="play_pause_elevation">6dp</dimen>
<dimen name="controls_tap_target_width">188dp</dimen>
- <dimen name="controls_tap_target_height">188dp</dimen>
- <dimen name="controls_margin">46dp</dimen>
- <dimen name="controls_spacing_inner">16dp</dimen>
- <dimen name="controls_spacing_outer">81dp</dimen>
+ <dimen name="controls_tap_target_height">128dp</dimen>
<dimen name="overflow_margin">46dp</dimen>
<dimen name="overflow_spacing_outer">49dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0a2c58b..da8b0ac 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -25,4 +25,10 @@
<dimen name="now_playing_metadata_top_margin">0dp</dimen>
<dimen name="missing_permission_icon_size">208dp</dimen>
+
+ <dimen name="controls_tap_target_width">64dp</dimen>
+ <dimen name="controls_tap_target_height">64dp</dimen>
+ <dimen name="controls_margin">46dp</dimen>
+ <dimen name="controls_spacing_inner">16dp</dimen>
+ <dimen name="controls_spacing_outer">81dp</dimen>
</resources>