diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-19 20:20:06 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-19 20:20:06 -0700 |
| commit | 45e77b8fe6a6fb9f30622e7cca76be7d959d27f7 (patch) | |
| tree | c25f4be6e2d5104e2803aef3ba92d401d4c055c5 /res | |
| parent | b9cadbf16a7e9a205a4fa94970dbbe82a98dd386 (diff) | |
| parent | 070553715d59999705e470794fae85d916e6d600 (diff) | |
| download | android_packages_apps_Gallery2-45e77b8fe6a6fb9f30622e7cca76be7d959d27f7.tar.gz android_packages_apps_Gallery2-45e77b8fe6a6fb9f30622e7cca76be7d959d27f7.tar.bz2 android_packages_apps_Gallery2-45e77b8fe6a6fb9f30622e7cca76be7d959d27f7.zip | |
Merge "Gallery2: Modify actionbar in photo editor interface." into android_ui.lnx.1.2-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/filtershow_actionbar.xml | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml index ec9ed2914..7e6d62504 100644 --- a/res/layout/filtershow_actionbar.xml +++ b/res/layout/filtershow_actionbar.xml @@ -14,20 +14,29 @@ See the License for the specific language governing permissions and limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="@dimen/toolbar_height" > +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="@dimen/toolbar_height" + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/filtershow_exit" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:scaleType="fitCenter" + android:src="@drawable/cancel" + android:layout_gravity="left|center_vertical" + android:paddingStart="16dp" /> <TextView android:id="@+id/filtershow_done" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:drawablePadding="24dp" - android:drawableStart="@drawable/done" - android:gravity="center_vertical" - android:paddingBottom="15dp" + android:layout_height="wrap_content" + android:paddingRight="13dp" + android:textSize="17sp" android:text="@string/save" - android:textColor="#ffffff" - android:textSize="18sp" /> + android:layout_gravity="center_vertical|right" + android:textColor="#ffffff" /> -</LinearLayout>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file |