Update focus rectangle assets.

bug:5223866
Change-Id: I7edd73f68f81e3f5c522afb6ec7d291f67b12204

18 files changed, 4 insertions, 29 deletions

diff --git a/res/drawable-hdpi/focus_focus_failed.9.png b/res/drawable-hdpi/focus_focus_failed.9.png
deleted file mode 100644
index 52336cc..0000000
--- a/res/drawable-hdpi/focus_focus_failed.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/focus_focused.9.png b/res/drawable-hdpi/focus_focused.9.png
deleted file mode 100644
index d941c48..0000000
--- a/res/drawable-hdpi/focus_focused.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/focus_focusing.9.png b/res/drawable-hdpi/focus_focusing.9.png
deleted file mode 100644
index 1838a6c..0000000
--- a/res/drawable-hdpi/focus_focusing.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_focus_failed.9.png b/res/drawable-hdpi/ic_focus_failed.9.png
new file mode 100644
index 0000000..3113301
--- /dev/null
+++ b/res/drawable-hdpi/ic_focus_failed.9.png
diff --git a/res/drawable-hdpi/ic_focus_focused.9.png b/res/drawable-hdpi/ic_focus_focused.9.png
new file mode 100644
index 0000000..c529e9a
--- /dev/null
+++ b/res/drawable-hdpi/ic_focus_focused.9.png
diff --git a/res/drawable-hdpi/ic_focus_focusing.9.png b/res/drawable-hdpi/ic_focus_focusing.9.png
new file mode 100644
index 0000000..c7e9acc
--- /dev/null
+++ b/res/drawable-hdpi/ic_focus_focusing.9.png
diff --git a/res/drawable-mdpi/focus_focus_failed.9.png b/res/drawable-mdpi/focus_focus_failed.9.png
deleted file mode 100644
index 6b425ea..0000000
--- a/res/drawable-mdpi/focus_focus_failed.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/focus_focused.9.png b/res/drawable-mdpi/focus_focused.9.png
deleted file mode 100644
index 71adb2a..0000000
--- a/res/drawable-mdpi/focus_focused.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/focus_focusing.9.png b/res/drawable-mdpi/focus_focusing.9.png
deleted file mode 100644
index 83bb2f0..0000000
--- a/res/drawable-mdpi/focus_focusing.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_focus_failed.9.png b/res/drawable-mdpi/ic_focus_failed.9.png
new file mode 100644
index 0000000..d781cb3
--- /dev/null
+++ b/res/drawable-mdpi/ic_focus_failed.9.png
diff --git a/res/drawable-mdpi/ic_focus_focused.9.png b/res/drawable-mdpi/ic_focus_focused.9.png
new file mode 100644
index 0000000..d81dc28
--- /dev/null
+++ b/res/drawable-mdpi/ic_focus_focused.9.png
diff --git a/res/drawable-mdpi/ic_focus_focusing.9.png b/res/drawable-mdpi/ic_focus_focusing.9.png
new file mode 100644
index 0000000..4f6f8d1
--- /dev/null
+++ b/res/drawable-mdpi/ic_focus_focusing.9.png
diff --git a/res/drawable-xhdpi/ic_focus_failed.9.png b/res/drawable-xhdpi/ic_focus_failed.9.png
new file mode 100644
index 0000000..2b4dc4d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_focus_failed.9.png
diff --git a/res/drawable-xhdpi/ic_focus_focused.9.png b/res/drawable-xhdpi/ic_focus_focused.9.png
new file mode 100644
index 0000000..f5b2376
--- /dev/null
+++ b/res/drawable-xhdpi/ic_focus_focused.9.png
diff --git a/res/drawable-xhdpi/ic_focus_focusing.9.png b/res/drawable-xhdpi/ic_focus_focusing.9.png
new file mode 100644
index 0000000..e4be86c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_focus_focusing.9.png
diff --git a/res/layout/face.xml b/res/layout/face.xml
deleted file mode 100644
index a4eb468..0000000
--- a/res/layout/face.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011 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.
-*/
--->
-<View xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:background="@drawable/focus_focused"
-        android:visibility="gone" />
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 85dd9bd..d5ebe6f 100644
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -42,7 +42,7 @@ public class FaceView extends View {
 
     public FaceView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mFaceRect = getResources().getDrawable(R.drawable.focus_focused);
+        mFaceRect = getResources().getDrawable(R.drawable.ic_focus_focusing);
     }
 
     public void setFaces(Face[] faces) {
diff --git a/src/com/android/camera/ui/FocusRectangle.java b/src/com/android/camera/ui/FocusRectangle.java
index fe6e7a0..7deb3bc 100644
--- a/src/com/android/camera/ui/FocusRectangle.java
+++ b/src/com/android/camera/ui/FocusRectangle.java
@@ -33,15 +33,15 @@ public class FocusRectangle extends View {
     }
 
     public void showStart() {
-        setDrawable(R.drawable.focus_focusing);
+        setDrawable(R.drawable.ic_focus_focusing);
     }
 
     public void showSuccess() {
-        setDrawable(R.drawable.focus_focused);
+        setDrawable(R.drawable.ic_focus_focused);
     }
 
     public void showFail() {
-        setDrawable(R.drawable.focus_focus_failed);
+        setDrawable(R.drawable.ic_focus_failed);
     }
 
     public void clear() {