From e2369594edd68180b5820afdd33a274a7e7a7f4a Mon Sep 17 00:00:00 2001
From: Wu-cheng Li <wuchengli@google.com>
Date: Sat, 21 May 2011 15:44:54 +0800
Subject: Move layout and resource to sw485dp.

Camera app has phone UI and tablet UI. Phone UI can be used
by one hand in portrait mode. So all the controls are on the
same side. The maximum size that can be comfortablely used
by one hand is around 480dp. If both sides of the screen are
bigger than 480dp, the app will use tablet UI. Use sw485dp to
make sure 640x480dp use phone UI.

Also remove some hard-coded values in xlarge layout.

bug:4473360

Change-Id: I8a1dafaee84594b84a81f21f05c2568e5f7d324d
---
 res/drawable-xlarge/btn_ic_camera_shutter.xml | 21 ---------------------
 res/drawable-xlarge/btn_review_control.xml    | 21 ---------------------
 res/drawable-xlarge/btn_shutter.xml           | 21 ---------------------
 res/drawable-xlarge/btn_shutter_recording.xml | 21 ---------------------
 res/drawable-xlarge/btn_zoom_in.xml           | 21 ---------------------
 res/drawable-xlarge/btn_zoom_out.xml          | 21 ---------------------
 6 files changed, 126 deletions(-)
 delete mode 100644 res/drawable-xlarge/btn_ic_camera_shutter.xml
 delete mode 100644 res/drawable-xlarge/btn_review_control.xml
 delete mode 100644 res/drawable-xlarge/btn_shutter.xml
 delete mode 100644 res/drawable-xlarge/btn_shutter_recording.xml
 delete mode 100644 res/drawable-xlarge/btn_zoom_in.xml
 delete mode 100644 res/drawable-xlarge/btn_zoom_out.xml

(limited to 'res/drawable-xlarge')

diff --git a/res/drawable-xlarge/btn_ic_camera_shutter.xml b/res/drawable-xlarge/btn_ic_camera_shutter.xml
deleted file mode 100644
index aa98917..0000000
--- a/res/drawable-xlarge/btn_ic_camera_shutter.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/button_ic_camera_shutter_pressed" />
-    <item android:drawable="@drawable/button_ic_camera_shutter" />
-</selector>
-
diff --git a/res/drawable-xlarge/btn_review_control.xml b/res/drawable-xlarge/btn_review_control.xml
deleted file mode 100644
index 1dd81ca..0000000
--- a/res/drawable-xlarge/btn_review_control.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/bg_text_on_preview_pressed" />
-    <item android:drawable="@drawable/bg_text_on_preview_transparent" />
-</selector>
-
diff --git a/res/drawable-xlarge/btn_shutter.xml b/res/drawable-xlarge/btn_shutter.xml
deleted file mode 100644
index d1772ae..0000000
--- a/res/drawable-xlarge/btn_shutter.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/button_camera_shutter_pressed_holo" />
-    <item android:drawable="@drawable/button_camera_shutter_holo" />
-</selector>
-
diff --git a/res/drawable-xlarge/btn_shutter_recording.xml b/res/drawable-xlarge/btn_shutter_recording.xml
deleted file mode 100644
index c2a07ff..0000000
--- a/res/drawable-xlarge/btn_shutter_recording.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/button_video_shutter_pressed_holo" />
-    <item android:drawable="@drawable/button_video_shutter_holo" />
-</selector>
-
diff --git a/res/drawable-xlarge/btn_zoom_in.xml b/res/drawable-xlarge/btn_zoom_in.xml
deleted file mode 100644
index d798b5a..0000000
--- a/res/drawable-xlarge/btn_zoom_in.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/button_zoom_in_pressed_holo" />
-    <item android:state_enabled="false" android:drawable="@drawable/button_zoom_in_disabled_holo" />
-    <item android:drawable="@drawable/button_zoom_in_holo" />
-</selector>
diff --git a/res/drawable-xlarge/btn_zoom_out.xml b/res/drawable-xlarge/btn_zoom_out.xml
deleted file mode 100644
index 925327d..0000000
--- a/res/drawable-xlarge/btn_zoom_out.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/button_zoom_out_pressed_holo" />
-    <item android:state_enabled="false" android:drawable="@drawable/button_zoom_out_disabled_holo" />
-    <item android:drawable="@drawable/button_zoom_out_holo" />
-</selector>
-- 
cgit v1.1