am 55ebba9b: Change to fit color name text on color selection spinner in settings. automerge: a46c723 automerge: f99df05

* commit '55ebba9bedcfec79586426ccebda55b5b7af45f9':
  Change to fit color name text on color selection spinner in settings.
This commit is contained in:
Sanket Padawe
2015-01-30 21:19:33 +00:00
committed by Android Git Automerger
2 changed files with 1 additions and 2 deletions

View File

@@ -63,7 +63,7 @@
<Spinner <Spinner
android:id="@+id/spinner" android:id="@+id/spinner"
android:layout_width="@dimen/color_picker_width" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/sim_content_padding" /> android:paddingStart="@dimen/sim_content_padding" />

View File

@@ -231,6 +231,5 @@
<!-- Color picker --> <!-- Color picker -->
<dimen name="color_swatch_size">16dp</dimen> <dimen name="color_swatch_size">16dp</dimen>
<dimen name="color_swatch_stroke_width">4dp</dimen> <dimen name="color_swatch_stroke_width">4dp</dimen>
<dimen name="color_picker_width">156dp</dimen>
</resources> </resources>