diff options
author | Doris Liu <tianliu@google.com> | 2013-02-11 21:33:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-11 21:33:29 +0000 |
commit | 3e23d53337d9f78ffed2523037f1cbb61a34398f (patch) | |
tree | f7cbc4b357bed6f01b6aab0962ac033b490634eb | |
parent | 878fcb4379718e13504dbebe8cf51fc2b60de22b (diff) | |
parent | 06b6cd2fdb02cd77ada72059a235928b7391c729 (diff) | |
download | android_packages_apps_Snap-3e23d53337d9f78ffed2523037f1cbb61a34398f.tar.gz android_packages_apps_Snap-3e23d53337d9f78ffed2523037f1cbb61a34398f.tar.bz2 android_packages_apps_Snap-3e23d53337d9f78ffed2523037f1cbb61a34398f.zip |
Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
-rw-r--r-- | res/layout-land/photo_module_content.xml | 4 | ||||
-rw-r--r-- | res/layout-land/video_module.xml | 2 | ||||
-rw-r--r-- | res/layout-port/photo_module_content.xml | 2 | ||||
-rw-r--r-- | res/layout-port/video_module.xml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/res/layout-land/photo_module_content.xml b/res/layout-land/photo_module_content.xml index 2afcf4081..d734f8329 100644 --- a/res/layout-land/photo_module_content.xml +++ b/res/layout-land/photo_module_content.xml @@ -37,14 +37,14 @@ android:layout_width="80dip" android:layout_height="80dip" android:layout_marginTop="-5dip" - android:layout_marginRight="-2dip" + android:layout_marginRight="-2dip" android:layout_gravity="top|right"/> <include layout="@layout/review_module_control" android:layout_marginRight="2dip" /> - <View + <com.android.camera.ui.PieMenuButton android:id="@+id/menu" style="@style/SwitcherButton" android:contentDescription="@string/accessibility_menu_button" diff --git a/res/layout-land/video_module.xml b/res/layout-land/video_module.xml index 8dcdc848c..972a7f901 100644 --- a/res/layout-land/video_module.xml +++ b/res/layout-land/video_module.xml @@ -45,7 +45,7 @@ <include layout="@layout/review_module_control" android:layout_marginRight="2dip" /> - <View + <com.android.camera.ui.PieMenuButton android:id="@+id/menu" style="@style/SwitcherButton" android:layout_alignParentRight="true" diff --git a/res/layout-port/photo_module_content.xml b/res/layout-port/photo_module_content.xml index 79438a5d0..a82a7a138 100644 --- a/res/layout-port/photo_module_content.xml +++ b/res/layout-port/photo_module_content.xml @@ -43,7 +43,7 @@ <include layout="@layout/review_module_control" android:layout_marginBottom="2dip" /> - <View + <com.android.camera.ui.PieMenuButton android:id="@+id/menu" style="@style/SwitcherButton" android:layout_gravity="bottom|right" diff --git a/res/layout-port/video_module.xml b/res/layout-port/video_module.xml index 7aedb8c4b..d8a6490d4 100644 --- a/res/layout-port/video_module.xml +++ b/res/layout-port/video_module.xml @@ -45,7 +45,7 @@ <include layout="@layout/review_module_control" android:layout_marginBottom="2dip" /> - <View + <com.android.camera.ui.PieMenuButton android:id="@+id/menu" style="@style/SwitcherButton" android:contentDescription="@string/accessibility_menu_button" |