diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-09-24 16:48:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-24 16:48:28 -0700 |
| commit | b1f68393c96fbeb9f2cc1b54bae4579b18ebcf7b (patch) | |
| tree | b963367291f19e5f60ac37ed08ff2e85ca044b88 | |
| parent | 62ff5222af31de3757a9ad5428f68d0e338ae060 (diff) | |
| parent | 15152c9eec2a110e8ae459b756e694690ad6aca5 (diff) | |
| download | android_packages_apps_Gallery2-b1f68393c96fbeb9f2cc1b54bae4579b18ebcf7b.tar.gz android_packages_apps_Gallery2-b1f68393c96fbeb9f2cc1b54bae4579b18ebcf7b.tar.bz2 android_packages_apps_Gallery2-b1f68393c96fbeb9f2cc1b54bae4579b18ebcf7b.zip | |
am 15152c9e: Merge "Fix color panel bgd color" into gb-ub-photos-carlsbad
* commit '15152c9eec2a110e8ae459b756e694690ad6aca5':
Fix color panel bgd color
| -rw-r--r-- | res/layout/filtershow_color_picker.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/filtershow_color_picker.xml b/res/layout/filtershow_color_picker.xml index e2af5bd2b..e56bc0d49 100644 --- a/res/layout/filtershow_color_picker.xml +++ b/res/layout/filtershow_color_picker.xml @@ -24,7 +24,7 @@ android:id="@+id/RelativeLayout1" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/default_background"> + android:background="@color/background_main_toolbar"> <com.android.gallery3d.filtershow.colorpicker.ColorCompareView android:id="@+id/btnSelect" @@ -32,7 +32,7 @@ android:layout_height="32dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:layout_marginTop="8dp" + android:layout_marginTop="20dp" android:layout_marginBottom="0dp" /> <com.android.gallery3d.filtershow.colorpicker.ColorSVRectView |