Gallery2: Modified layout of crop and exposure model in photo editor.

1. Modified layout in crop model.
2. Remove mirror and draw only keep crop, straighten, rotate in
crop model.
3. Adjust style of seekbar in exposure model.
4. Modified layout in exposure model.
5. Remove '4:3', '3:4', '5:7' and '7:5' functions from crop.
According to UX specification document.

Change-Id: Ib536b3f57a83053bac8fc6ec778675a82b6327e6
CRs-Fixed: 988082 988090

2 files changed, 0 insertions, 175 deletions

diff --git a/res/layout-land/filtershow_category_panel_new.xml b/res/layout-land/filtershow_category_panel_new.xml
deleted file mode 100644
index 26b92e769..000000000
--- a/res/layout-land/filtershow_category_panel_new.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/edit_actionbar_background"
-    android:orientation="horizontal" >
-
-    <!-- <com.android.gallery3d.filtershow.category.IconView -->
-    <!-- android:id="@+id/addButton" -->
-    <!-- android:layout_width="match_parent" -->
-    <!-- android:layout_height="@dimen/category_panel_height" -->
-    <!-- android:src="@drawable/filtershow_add"/> -->
-
-
-    <!-- <ListView -->
-    <!-- android:id="@+id/listItems" -->
-    <!-- android:orientation="vertical" -->
-    <!-- android:layout_width="match_parent" -->
-    <!-- android:layout_height="@dimen/category_panel_height" -->
-    <!-- android:layout_margin="8dip" -->
-    <!-- android:divider="@android:color/transparent" -->
-    <!-- android:dividerHeight="8dip" -->
-    <!-- android:layout_weight="1"/> -->
-
-    <HorizontalScrollView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:scrollbars="none" >
-
-        <com.android.gallery3d.filtershow.category.CategoryTrack
-            android:id="@+id/listItems"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/category_panel_height"
-            android:divider="@android:color/transparent"
-            android:dividerPadding="8dip"
-            custom:iconSize="@dimen/category_panel_icon_size" />
-    </HorizontalScrollView>
-
-    <com.android.gallery3d.filtershow.category.IconView
-        android:id="@+id/addButton"
-        android:layout_width="@dimen/category_panel_height"
-        android:layout_height="@dimen/category_panel_height"
-        android:src="@drawable/filtershow_add" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml
deleted file mode 100644
index 59885e0f0..000000000
--- a/res/layout-land/filtershow_editor_panel.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     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:id="@+id/top"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:visibility="visible" >
-
-    <!-- <RelativeLayout -->
-    <!-- android:layout_width="match_parent" -->
-    <!-- android:layout_height="match_parent" > -->
-
-    <Button
-        android:id="@+id/toggle_state"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:background="@color/background_main_toolbar"
-        android:text="@string/imageState"
-        android:visibility="gone" />
-
-    <!-- <LinearLayout -->
-    <!-- android:id="@+id/applyBar" -->
-    <!-- android:layout_width="match_parent" -->
-    <!-- android:layout_height="48dip" -->
-    <!-- android:layout_above="@id/bottomControlLineBottom" -->
-    <!-- android:background="@color/background_main_toolbar" -->
-    <!-- android:baselineAligned="false" -->
-    <!-- android:orientation="horizontal" -->
-    <!-- android:visibility="visible" > -->
-
-
-    <!-- <ImageButton -->
-    <!-- android:id="@+id/cancelFilter" -->
-    <!-- android:layout_width="wrap_content" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_gravity="left|center_vertical" -->
-    <!-- android:layout_weight=".1" -->
-    <!-- android:background="@android:color/transparent" -->
-    <!-- android:gravity="center" -->
-    <!-- android:src="@drawable/ic_menu_cancel_holo_light" -->
-    <!-- android:textSize="18dip" /> -->
-
-
-    <!-- <LinearLayout -->
-    <!-- android:id="@+id/panelAccessoryViewList" -->
-    <!-- android:layout_width="wrap_content" -->
-    <!-- android:layout_height="match_parent" -->
-    <!-- android:layout_weight="1" -->
-    <!-- android:orientation="horizontal" -->
-    <!-- android:visibility="visible" > -->
-
-
-    <!-- <com.android.gallery3d.filtershow.editors.SwapButton -->
-    <!-- android:id="@+id/applyEffect" -->
-    <!-- android:layout_width="fill_parent" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_gravity="center" -->
-    <!-- android:background="@android:color/transparent" -->
-    <!-- android:drawableEnd="@drawable/filtershow_menu_marker_rtl" -->
-    <!-- android:text="@string/apply_effect" -->
-    <!-- android:textSize="18dip" /> -->
-    <!-- </LinearLayout> -->
-
-
-    <!-- <ImageButton -->
-    <!-- android:id="@+id/applyFilter" -->
-    <!-- android:layout_width="wrap_content" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_gravity="right|center_vertical" -->
-    <!-- android:layout_weight=".1" -->
-    <!-- android:background="@android:color/transparent" -->
-    <!-- android:gravity="center" -->
-    <!-- android:src="@drawable/ic_menu_done_holo_light" -->
-    <!-- android:textSize="18dip" /> -->
-    <!-- </LinearLayout> -->
-
-    <LinearLayout
-        android:id="@+id/controlArea"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="bottom"
-        android:orientation="horizontal"
-        android:visibility="visible" >
-
-        <SeekBar
-            android:id="@+id/primarySeekBar"
-            style="@style/FilterShowSlider"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:visibility="gone" />
-    </LinearLayout>
-    <!-- </RelativeLayout> -->
-
-</LinearLayout>
\ No newline at end of file