diff options
| -rw-r--r-- | res/drawable/list_border.xml | 5 | ||||
| -rw-r--r-- | res/layout-port/camera_controls.xml | 18 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 8 |
3 files changed, 13 insertions, 18 deletions
diff --git a/res/drawable/list_border.xml b/res/drawable/list_border.xml index 7d05a087f..e6a380853 100644 --- a/res/drawable/list_border.xml +++ b/res/drawable/list_border.xml @@ -30,9 +30,4 @@ android:shape="rectangle" > <solid android:color="@color/popup_background" /> - - <stroke - android:width="1dip" - android:color="@color/list_divider_color" /> - </shape> diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index 5b92db021..77ff076b9 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -25,10 +25,6 @@ android:layout_gravity="bottom" android:clickable="true" /> - <com.android.camera.ui.RotateImageView - android:id="@+id/filter_mode_switcher" - style="@style/ToggleButton" /> - <com.android.camera.ui.ModuleSwitcher android:id="@+id/camera_switcher" style="@style/SwitcherButton" @@ -60,11 +56,17 @@ android:scaleType="fitCenter" /> <com.android.camera.ui.RotateImageView + android:id="@+id/menu" + style="@style/ToggleButton" + android:contentDescription="@string/accessibility_menu_button" + android:src="@drawable/ic_settings" /> + + <com.android.camera.ui.RotateImageView android:id="@+id/front_back_switcher" style="@style/ToggleButton" /> <com.android.camera.ui.RotateImageView - android:id="@+id/hdr_switcher" + android:id="@+id/filter_mode_switcher" style="@style/ToggleButton" /> <com.android.camera.ui.RotateImageView @@ -72,10 +74,8 @@ style="@style/ToggleButton" /> <com.android.camera.ui.RotateImageView - android:id="@+id/menu" - style="@style/ToggleButton" - android:contentDescription="@string/accessibility_menu_button" - android:src="@drawable/ic_settings" /> + android:id="@+id/hdr_switcher" + style="@style/ToggleButton" /> <LinearLayout android:id="@+id/remaining_photos" diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 0c6469709..4a61a7e5b 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -201,8 +201,8 @@ public class CameraControls extends RotatableLayout { mHistogramView = (HistogramView) findViewById(R.id.histogram); mTopViews = new View[] { - mSceneModeSwitcher, mFilterModeSwitcher, mHdrSwitcher, - mFrontBackSwitcher, mMenu, mAutoHdrNotice, mHistogramView + mMenu, mFrontBackSwitcher, mFilterModeSwitcher, + mSceneModeSwitcher, mHdrSwitcher, mAutoHdrNotice, mHistogramView }; mBottomViews = new View[] { mPreview, mShutter, mSwitcher @@ -252,8 +252,8 @@ public class CameraControls extends RotatableLayout { int w = r - l; int h = b - t; - asRow(true, w, h, rotation, mSceneModeSwitcher, mFilterModeSwitcher, - mFrontBackSwitcher, mHdrSwitcher, mMenu); + asRow(true, w, h, rotation, mMenu,mFrontBackSwitcher, + mFilterModeSwitcher, mSceneModeSwitcher, mHdrSwitcher); center(mAutoHdrNotice, l, t + mSize, r, t + mSize + mAutoHdrNotice.getMeasuredHeight(), |