From 69b444430b27b2f43e5f9954949714e1017fc62c Mon Sep 17 00:00:00 2001
From: Hung-ying Tyan <tyanh@google.com>
Date: Thu, 2 Dec 2010 14:49:56 +0800
Subject: Create drawable-xlarge-mdpi directory for Camera.

Move large icons from drawable-mdpi to the new directory.
Remove/revise some xml files accordingly.

Change-Id: Ia138ba1deffcfa7cf0aa0646906ec562f160c48d
---
 res/drawable-mdpi/btn_ic_camera_shutter_large.png  | Bin 3844 -> 0 bytes
 res/drawable-mdpi/btn_shutter_large_normal.png     | Bin 13686 -> 0 bytes
 res/drawable-mdpi/btn_shutter_large_pressed.png    | Bin 14432 -> 0 bytes
 res/drawable-xlarge-mdpi/btn_ic_camera_shutter.png | Bin 0 -> 3844 bytes
 res/drawable-xlarge-mdpi/btn_shutter_normal.png    | Bin 0 -> 13686 bytes
 res/drawable-xlarge-mdpi/btn_shutter_pressed.png   | Bin 0 -> 14432 bytes
 res/drawable/btn_shutter_large.xml                 |  21 ---------------------
 res/layout-xlarge/camera_control.xml               |   4 ++--
 8 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 res/drawable-mdpi/btn_ic_camera_shutter_large.png
 delete mode 100644 res/drawable-mdpi/btn_shutter_large_normal.png
 delete mode 100644 res/drawable-mdpi/btn_shutter_large_pressed.png
 create mode 100644 res/drawable-xlarge-mdpi/btn_ic_camera_shutter.png
 create mode 100644 res/drawable-xlarge-mdpi/btn_shutter_normal.png
 create mode 100644 res/drawable-xlarge-mdpi/btn_shutter_pressed.png
 delete mode 100644 res/drawable/btn_shutter_large.xml

(limited to 'res')

diff --git a/res/drawable-mdpi/btn_ic_camera_shutter_large.png b/res/drawable-mdpi/btn_ic_camera_shutter_large.png
deleted file mode 100644
index 74d37cb..0000000
Binary files a/res/drawable-mdpi/btn_ic_camera_shutter_large.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_shutter_large_normal.png b/res/drawable-mdpi/btn_shutter_large_normal.png
deleted file mode 100644
index b068536..0000000
Binary files a/res/drawable-mdpi/btn_shutter_large_normal.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_shutter_large_pressed.png b/res/drawable-mdpi/btn_shutter_large_pressed.png
deleted file mode 100644
index eaed6c5..0000000
Binary files a/res/drawable-mdpi/btn_shutter_large_pressed.png and /dev/null differ
diff --git a/res/drawable-xlarge-mdpi/btn_ic_camera_shutter.png b/res/drawable-xlarge-mdpi/btn_ic_camera_shutter.png
new file mode 100644
index 0000000..74d37cb
Binary files /dev/null and b/res/drawable-xlarge-mdpi/btn_ic_camera_shutter.png differ
diff --git a/res/drawable-xlarge-mdpi/btn_shutter_normal.png b/res/drawable-xlarge-mdpi/btn_shutter_normal.png
new file mode 100644
index 0000000..b068536
Binary files /dev/null and b/res/drawable-xlarge-mdpi/btn_shutter_normal.png differ
diff --git a/res/drawable-xlarge-mdpi/btn_shutter_pressed.png b/res/drawable-xlarge-mdpi/btn_shutter_pressed.png
new file mode 100644
index 0000000..eaed6c5
Binary files /dev/null and b/res/drawable-xlarge-mdpi/btn_shutter_pressed.png differ
diff --git a/res/drawable/btn_shutter_large.xml b/res/drawable/btn_shutter_large.xml
deleted file mode 100644
index 1a8181b..0000000
--- a/res/drawable/btn_shutter_large.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/btn_shutter_large_pressed" />
-    <item android:drawable="@drawable/btn_shutter_large_normal" />
-</selector>
-
diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml
index bc6fd1f..148b30e 100644
--- a/res/layout-xlarge/camera_control.xml
+++ b/res/layout-xlarge/camera_control.xml
@@ -55,8 +55,8 @@
                         android:scaleType="center"
                         android:clickable="true"
                         android:focusable="true"
-                        android:src="@drawable/btn_ic_camera_shutter_large"
-                        android:background="@drawable/btn_shutter_large" />
+                        android:src="@drawable/btn_ic_camera_shutter"
+                        android:background="@drawable/btn_shutter" />
         </com.android.camera.ui.IndicatorWheel>
 
         <com.android.camera.SwitcherSet android:id="@+id/camera_switch"
-- 
cgit v1.1