summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-01-30 19:58:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-30 19:58:41 +0000
commit55ebba9bedcfec79586426ccebda55b5b7af45f9 (patch)
tree2203a1f17ab60188d9f381d39c0b7fac8b05800b
parentb33c8ad518796e7931cff157b06f791384d575d8 (diff)
parentf99df057acb077e7601ec11d27be1bca0265247b (diff)
downloadpackages_apps_Settings-55ebba9bedcfec79586426ccebda55b5b7af45f9.zip
packages_apps_Settings-55ebba9bedcfec79586426ccebda55b5b7af45f9.tar.gz
packages_apps_Settings-55ebba9bedcfec79586426ccebda55b5b7af45f9.tar.bz2
Change to fit color name text on color selection spinner in settings. automerge: a46c723
automerge: f99df05 * commit 'f99df057acb077e7601ec11d27be1bca0265247b': Change to fit color name text on color selection spinner in settings.
-rw-r--r--res/layout/multi_sim_dialog.xml2
-rwxr-xr-xres/values/dimens.xml1
2 files changed, 1 insertions, 2 deletions
diff --git a/res/layout/multi_sim_dialog.xml b/res/layout/multi_sim_dialog.xml
index 46fbda8..d0e7df8 100644
--- a/res/layout/multi_sim_dialog.xml
+++ b/res/layout/multi_sim_dialog.xml
@@ -63,7 +63,7 @@
<Spinner
android:id="@+id/spinner"
- android:layout_width="@dimen/color_picker_width"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/sim_content_padding" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4c4dbda..339a2e4 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -230,6 +230,5 @@
<!-- Color picker -->
<dimen name="color_swatch_size">16dp</dimen>
<dimen name="color_swatch_stroke_width">4dp</dimen>
- <dimen name="color_picker_width">156dp</dimen>
</resources>