diff options
| author | Yuli Huang <yuli@google.com> | 2011-10-04 19:56:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-04 19:56:15 -0700 |
| commit | a7bbb047782014cf794c6386df2ef20c57f3a164 (patch) | |
| tree | ba81ea293facfe56bfd870b1a216188fbae5767b /res | |
| parent | 26e879403f006fc59464b73352b9da68750825ca (diff) | |
| parent | 915d58379336d1c19df77f26336d82def95968de (diff) | |
| download | android_packages_apps_Gallery2-a7bbb047782014cf794c6386df2ef20c57f3a164.tar.gz android_packages_apps_Gallery2-a7bbb047782014cf794c6386df2ef20c57f3a164.tar.bz2 android_packages_apps_Gallery2-a7bbb047782014cf794c6386df2ef20c57f3a164.zip | |
Merge "Fix b/5032231: Allow share in Photo Editor."
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/photoeditor_actionbar.xml | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/res/layout/photoeditor_actionbar.xml b/res/layout/photoeditor_actionbar.xml index 82ed41ffc..40c18d828 100644 --- a/res/layout/photoeditor_actionbar.xml +++ b/res/layout/photoeditor_actionbar.xml @@ -44,9 +44,22 @@ android:id="@+id/redo_button" style="@style/ImageActionButton" android:src="@drawable/photoeditor_redo"/> - <Button - android:id="@+id/save_button" - style="@style/TextActionButton" - android:text="@string/save"/> + + <ViewSwitcher + android:id="@+id/save_share_buttons" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <Button + android:id="@+id/save_button" + style="@style/TextActionButton" + android:layout_width="fill_parent" + android:text="@string/save"/> + <ImageButton + android:id="@+id/share_button" + style="@style/ImageActionButton" + android:layout_width="fill_parent" + android:src="@drawable/ic_menu_share_holo_light"/> + </ViewSwitcher> + </LinearLayout> </com.android.gallery3d.photoeditor.ActionBar> |