diff options
| author | Yuli Huang <yuli@google.com> | 2012-02-08 23:57:11 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-08 23:57:11 -0800 |
| commit | ce08e9e203468b0073853d782456125c0fdc242b (patch) | |
| tree | 7bc53ace8bc0b67dbeedcb9228c56f76d8e6d96d /res | |
| parent | 4182728efc0e00239dcd0adea5a697ddbce1420c (diff) | |
| parent | e0f1afb886c47cbe222b1c16c86b7c3bd5742783 (diff) | |
| download | android_packages_apps_Snap-ce08e9e203468b0073853d782456125c0fdc242b.tar.gz android_packages_apps_Snap-ce08e9e203468b0073853d782456125c0fdc242b.tar.bz2 android_packages_apps_Snap-ce08e9e203468b0073853d782456125c0fdc242b.zip | |
Merge "Fix b/5974663: inconsistent transparency of disabled action buttons."
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/photoeditor_actionbar.xml | 6 | ||||
| -rw-r--r-- | res/layout/photoeditor_effects_menu.xml | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/res/layout/photoeditor_actionbar.xml b/res/layout/photoeditor_actionbar.xml index 8bd51ed43..e0adbbef9 100644 --- a/res/layout/photoeditor_actionbar.xml +++ b/res/layout/photoeditor_actionbar.xml @@ -36,11 +36,11 @@ <LinearLayout style="@style/ActionBarLinearLayout" android:layout_alignParentRight="true"> - <ImageButton + <com.android.gallery3d.photoeditor.ImageActionButton android:id="@+id/undo_button" style="@style/ImageActionButton" android:src="@drawable/photoeditor_undo"/> - <ImageButton + <com.android.gallery3d.photoeditor.ImageActionButton android:id="@+id/redo_button" style="@style/ImageActionButton" android:src="@drawable/photoeditor_redo"/> @@ -54,7 +54,7 @@ style="@style/TextActionButton" android:layout_width="fill_parent" android:text="@string/save"/> - <ImageButton + <com.android.gallery3d.photoeditor.ImageActionButton android:id="@+id/share_button" style="@style/ImageActionButton" android:layout_width="fill_parent" diff --git a/res/layout/photoeditor_effects_menu.xml b/res/layout/photoeditor_effects_menu.xml index 1688a9056..a0b102dbe 100644 --- a/res/layout/photoeditor_effects_menu.xml +++ b/res/layout/photoeditor_effects_menu.xml @@ -23,19 +23,19 @@ android:id="@+id/toggles" style="@style/EffectsMenuContainer"> - <ImageButton + <com.android.gallery3d.photoeditor.ImageActionButton android:id="@+id/exposure_button" style="@style/EffectsMenuActionButton" android:src="@drawable/photoeditor_exposure"/> - <ImageButton + <com.android.gallery3d.photoeditor.ImageActionButton android:id="@+id/artistic_button" style="@style/EffectsMenuActionButton" android:src="@drawable/photoeditor_artistic"/> - <ImageButton + <com.android.gallery3d.photoeditor.ImageActionButton android:id="@+id/color_button" style="@style/EffectsMenuActionButton" android:src="@drawable/photoeditor_color"/> - <ImageButton + <com.android.gallery3d.photoeditor.ImageActionButton android:id="@+id/fix_button" style="@style/EffectsMenuActionButton" android:src="@drawable/photoeditor_fix"/> |