summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-12-02 14:49:56 +0800
committerHung-ying Tyan <tyanh@google.com>2010-12-02 14:49:56 +0800
commit69b444430b27b2f43e5f9954949714e1017fc62c (patch)
treec816cae4c82707d72d9a1630f8d648321f8c2dd8 /res
parentf6aaa2a6642ec7f62883c67f9a7a80122c84747a (diff)
downloadpackages_apps_LegacyCamera-69b444430b27b2f43e5f9954949714e1017fc62c.zip
packages_apps_LegacyCamera-69b444430b27b2f43e5f9954949714e1017fc62c.tar.gz
packages_apps_LegacyCamera-69b444430b27b2f43e5f9954949714e1017fc62c.tar.bz2
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
Diffstat (limited to 'res')
-rw-r--r--res/drawable-xlarge-mdpi/btn_ic_camera_shutter.png (renamed from res/drawable-mdpi/btn_ic_camera_shutter_large.png)bin3844 -> 3844 bytes
-rw-r--r--res/drawable-xlarge-mdpi/btn_shutter_normal.png (renamed from res/drawable-mdpi/btn_shutter_large_normal.png)bin13686 -> 13686 bytes
-rw-r--r--res/drawable-xlarge-mdpi/btn_shutter_pressed.png (renamed from res/drawable-mdpi/btn_shutter_large_pressed.png)bin14432 -> 14432 bytes
-rw-r--r--res/drawable/btn_shutter_large.xml21
-rw-r--r--res/layout-xlarge/camera_control.xml4
5 files changed, 2 insertions, 23 deletions
diff --git a/res/drawable-mdpi/btn_ic_camera_shutter_large.png b/res/drawable-xlarge-mdpi/btn_ic_camera_shutter.png
index 74d37cb..74d37cb 100644
--- a/res/drawable-mdpi/btn_ic_camera_shutter_large.png
+++ b/res/drawable-xlarge-mdpi/btn_ic_camera_shutter.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_shutter_large_normal.png b/res/drawable-xlarge-mdpi/btn_shutter_normal.png
index b068536..b068536 100644
--- a/res/drawable-mdpi/btn_shutter_large_normal.png
+++ b/res/drawable-xlarge-mdpi/btn_shutter_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_shutter_large_pressed.png b/res/drawable-xlarge-mdpi/btn_shutter_pressed.png
index eaed6c5..eaed6c5 100644
--- a/res/drawable-mdpi/btn_shutter_large_pressed.png
+++ b/res/drawable-xlarge-mdpi/btn_shutter_pressed.png
Binary files 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"