diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-03-23 01:26:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-03-23 01:26:22 -0700 |
| commit | 3d53b5ff000fa99c557f5f15d6a1a985616ffed5 (patch) | |
| tree | e978976bc18fe62cebcdb3718829800a2a764dbd | |
| parent | fcc433780cb7cb225a31307969ce3fbeaa040b1f (diff) | |
| parent | 5f46d7af2c022ef7c32d19d30f7d9ee3f42c4c83 (diff) | |
| download | android_packages_apps_Gallery2-3d53b5ff000fa99c557f5f15d6a1a985616ffed5.tar.gz android_packages_apps_Gallery2-3d53b5ff000fa99c557f5f15d6a1a985616ffed5.tar.bz2 android_packages_apps_Gallery2-3d53b5ff000fa99c557f5f15d6a1a985616ffed5.zip | |
Merge "Gallery2: Remove frame button in photo edit." into android_ui.lnx.1.2-dev
| -rw-r--r-- | res/layout/filtershow_main_panel.xml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml index ee9990d3d..00d63c154 100644 --- a/res/layout/filtershow_main_panel.xml +++ b/res/layout/filtershow_main_panel.xml @@ -46,13 +46,13 @@ <LinearLayout android:id="@+id/effectsContainer" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="10dp" > <ImageButton android:id="@+id/fxButton" - android:layout_width="@dimen/thumbnail_size" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:background="@android:color/transparent" @@ -67,11 +67,12 @@ android:background="@android:color/transparent" android:padding="2dip" android:scaleType="centerInside" + android:visibility="gone" android:src="@drawable/frames" /> <ImageButton android:id="@+id/geometryButton" - android:layout_width="@dimen/thumbnail_size" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:background="@android:color/transparent" @@ -81,7 +82,7 @@ <ImageButton android:id="@+id/colorsButton" - android:layout_width="@dimen/thumbnail_size" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:background="@android:color/transparent" @@ -144,13 +145,13 @@ <LinearLayout android:id="@+id/effectsText" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="match_parent" android:paddingTop="5dp" > <TextView android:id="@+id/tvColor" - android:layout_width="@dimen/thumbnail_size" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/color" @@ -166,11 +167,12 @@ android:text="@string/frames" android:textColor="#ffffff" android:gravity="center" + android:visibility="gone" android:textSize="@dimen/edit_main_font" /> <TextView android:id="@+id/tvCrop" - android:layout_width="@dimen/thumbnail_size" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/crop" @@ -180,7 +182,7 @@ <TextView android:id="@+id/tvExposure" - android:layout_width="@dimen/thumbnail_size" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/exposure" |