summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-08-13 17:38:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-13 17:38:13 +0000
commitc41fdd6f37df5dbd7f44b1c79cdd6d025937209d (patch)
tree2695d58f1115d1927cbd9ebf5cf9b50f209fe090 /res
parent0bdafb193e49e2b89eeb9f4c197bbc60635c6419 (diff)
parenta0cd22d21474c112ad78b011fbd6f0be977400e6 (diff)
downloadandroid_packages_apps_Gallery2-c41fdd6f37df5dbd7f44b1c79cdd6d025937209d.tar.gz
android_packages_apps_Gallery2-c41fdd6f37df5dbd7f44b1c79cdd6d025937209d.tar.bz2
android_packages_apps_Gallery2-c41fdd6f37df5dbd7f44b1c79cdd6d025937209d.zip
Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad
Diffstat (limited to 'res')
-rw-r--r--res/layout/filtershow_category_panel_new.xml29
1 files changed, 5 insertions, 24 deletions
diff --git a/res/layout/filtershow_category_panel_new.xml b/res/layout/filtershow_category_panel_new.xml
index 4e0091aab..8073f68a4 100644
--- a/res/layout/filtershow_category_panel_new.xml
+++ b/res/layout/filtershow_category_panel_new.xml
@@ -39,29 +39,10 @@
</HorizontalScrollView>
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <ImageButton
- android:id="@+id/addButton"
- android:layout_width="@dimen/category_panel_height"
- android:layout_height="@dimen/category_panel_height"
- android:src="@drawable/filtershow_add"
- style="?android:attr/borderlessButtonStyle"
- android:scaleType="fitCenter"
- android:padding="16dp"
- android:layout_marginBottom="6dp"
- android:layout_gravity="center"/>
-
- <TextView
- android:id="@+id/addButtonText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="4dp"
- android:layout_gravity="bottom|center"/>
-
- </FrameLayout>
+ <com.android.gallery3d.filtershow.category.IconView
+ android:id="@+id/addButton"
+ android:layout_width="@dimen/category_panel_height"
+ android:layout_height="@dimen/category_panel_height"
+ android:src="@drawable/filtershow_add"/>
</LinearLayout> \ No newline at end of file