diff options
| author | Zhang Zhenzhen <zhangzz6687@thundersoft.com> | 2015-03-10 16:40:13 +0800 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2015-03-18 22:18:11 -0700 |
| commit | 38478f2cfc651b58dd88274c9a3bb7526c91116b (patch) | |
| tree | 2d38112715d53f79e75015ebd985f283affe99f5 /res/layout | |
| parent | d51734fb007055835d706170650aa6765ac32899 (diff) | |
| download | android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.tar.gz android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.tar.bz2 android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.zip | |
Modify:Gallery2 for branch Gallery2
Conflicts:
res/values-zh-rCN/strings.xml
res/values/strings.xml
Change-Id: I6b760469290ca154f223f94a3c284fca7a513121
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/filtershow_main_panel.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml index d3400fae5..f8b26b088 100644 --- a/res/layout/filtershow_main_panel.xml +++ b/res/layout/filtershow_main_panel.xml @@ -95,8 +95,19 @@ android:scaleType="centerInside" android:src="@drawable/ic_photoeditor_color"/> + <ImageButton + android:id="@+id/makeupButton" + android:layout_width="@dimen/thumbnail_size" + android:layout_height="match_parent" + android:layout_weight="1" + android:padding="2dip" + android:background="@drawable/filtershow_button_background" + android:scaleType="centerInside" + android:visibility="gone" + android:src="@drawable/ic_photoeditor_makeup"/> + </LinearLayout> </com.android.gallery3d.filtershow.CenteredLinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> |