Fix wrong preview border drawable is displayed in phone UI.

Change-Id: Iccee528e8e3681f22480a0b726dac90c46757a5f

43 files changed, 7 insertions, 6 deletions

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 970660c9..1cf8763e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -45,6 +45,7 @@
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Camera*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Camera*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Camera*)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/res/drawable-hdpi/border_view_finder.9.png b/res/drawable-hdpi/border_preview.9.png
index b5922bfe..b5922bfe 100644
--- a/res/drawable-hdpi/border_view_finder.9.png
+++ b/res/drawable-hdpi/border_preview.9.png
diff --git a/res/drawable-hdpi/border_preview_time_lapse_holo.9.png b/res/drawable-hdpi/border_preview_time_lapse.9.png
index 331826d8..331826d8 100644
--- a/res/drawable-hdpi/border_preview_time_lapse_holo.9.png
+++ b/res/drawable-hdpi/border_preview_time_lapse.9.png
diff --git a/res/drawable-mdpi/border_view_finder.9.png b/res/drawable-mdpi/border_preview.9.png
index cb1141f1..cb1141f1 100755
--- a/res/drawable-mdpi/border_view_finder.9.png
+++ b/res/drawable-mdpi/border_preview.9.png
diff --git a/res/drawable-mdpi/border_preview_time_lapse_holo.9.png b/res/drawable-mdpi/border_preview_time_lapse.9.png
index 207f44f5..207f44f5 100644
--- a/res/drawable-mdpi/border_preview_time_lapse_holo.9.png
+++ b/res/drawable-mdpi/border_preview_time_lapse.9.png
diff --git a/res/drawable-hdpi/border_preview_holo.9.png b/res/drawable-w1024dp-hdpi/border_preview.9.png
index bc62d075..bc62d075 100644
--- a/res/drawable-hdpi/border_preview_holo.9.png
+++ b/res/drawable-w1024dp-hdpi/border_preview.9.png
diff --git a/res/drawable-mdpi/border_preview_holo.9.png b/res/drawable-w1024dp-mdpi/border_preview.9.png
index 75031dd1..75031dd1 100644
--- a/res/drawable-mdpi/border_preview_holo.9.png
+++ b/res/drawable-w1024dp-mdpi/border_preview.9.png
diff --git a/res/drawable-w1024dp/btn_ic_camera_shutter.xml b/res/drawable-w1024dp-mdpi/btn_ic_camera_shutter.xml
index aa989170..aa989170 100644
--- a/res/drawable-w1024dp/btn_ic_camera_shutter.xml
+++ b/res/drawable-w1024dp-mdpi/btn_ic_camera_shutter.xml
diff --git a/res/drawable-w1024dp/btn_ic_mode_switch_camera.xml b/res/drawable-w1024dp-mdpi/btn_ic_mode_switch_camera.xml
index e0e4952a..e0e4952a 100644
--- a/res/drawable-w1024dp/btn_ic_mode_switch_camera.xml
+++ b/res/drawable-w1024dp-mdpi/btn_ic_mode_switch_camera.xml
diff --git a/res/drawable-w1024dp/btn_ic_mode_switch_video.xml b/res/drawable-w1024dp-mdpi/btn_ic_mode_switch_video.xml
index 018dcfce..018dcfce 100644
--- a/res/drawable-w1024dp/btn_ic_mode_switch_video.xml
+++ b/res/drawable-w1024dp-mdpi/btn_ic_mode_switch_video.xml
diff --git a/res/drawable-w1024dp/btn_ic_review_play.png b/res/drawable-w1024dp-mdpi/btn_ic_review_play.png
index 6eca85c7..6eca85c7 100755
--- a/res/drawable-w1024dp/btn_ic_review_play.png
+++ b/res/drawable-w1024dp-mdpi/btn_ic_review_play.png
diff --git a/res/drawable-w1024dp/btn_ic_video_record_stop.png b/res/drawable-w1024dp-mdpi/btn_ic_video_record_stop.png
index b123eaf5..b123eaf5 100755
--- a/res/drawable-w1024dp/btn_ic_video_record_stop.png
+++ b/res/drawable-w1024dp-mdpi/btn_ic_video_record_stop.png
diff --git a/res/drawable-w1024dp/btn_review_control.xml b/res/drawable-w1024dp-mdpi/btn_review_control.xml
index 1dd81caf..1dd81caf 100644
--- a/res/drawable-w1024dp/btn_review_control.xml
+++ b/res/drawable-w1024dp-mdpi/btn_review_control.xml
diff --git a/res/drawable-w1024dp/btn_shutter.xml b/res/drawable-w1024dp-mdpi/btn_shutter.xml
index d1772ae3..d1772ae3 100644
--- a/res/drawable-w1024dp/btn_shutter.xml
+++ b/res/drawable-w1024dp-mdpi/btn_shutter.xml
diff --git a/res/drawable-w1024dp/btn_shutter_recording.xml b/res/drawable-w1024dp-mdpi/btn_shutter_recording.xml
index c2a07ff4..c2a07ff4 100644
--- a/res/drawable-w1024dp/btn_shutter_recording.xml
+++ b/res/drawable-w1024dp-mdpi/btn_shutter_recording.xml
diff --git a/res/drawable-w1024dp/btn_zoom_in.xml b/res/drawable-w1024dp-mdpi/btn_zoom_in.xml
index d798b5a0..d798b5a0 100644
--- a/res/drawable-w1024dp/btn_zoom_in.xml
+++ b/res/drawable-w1024dp-mdpi/btn_zoom_in.xml
diff --git a/res/drawable-w1024dp/btn_zoom_out.xml b/res/drawable-w1024dp-mdpi/btn_zoom_out.xml
index 925327d8..925327d8 100644
--- a/res/drawable-w1024dp/btn_zoom_out.xml
+++ b/res/drawable-w1024dp-mdpi/btn_zoom_out.xml
diff --git a/res/drawable-w1024dp/button_camera_shutter_holo.png b/res/drawable-w1024dp-mdpi/button_camera_shutter_holo.png
index 556c9216..556c9216 100644
--- a/res/drawable-w1024dp/button_camera_shutter_holo.png
+++ b/res/drawable-w1024dp-mdpi/button_camera_shutter_holo.png
diff --git a/res/drawable-w1024dp/button_camera_shutter_pressed_holo.png b/res/drawable-w1024dp-mdpi/button_camera_shutter_pressed_holo.png
index 7ccc3892..7ccc3892 100644
--- a/res/drawable-w1024dp/button_camera_shutter_pressed_holo.png
+++ b/res/drawable-w1024dp-mdpi/button_camera_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp/button_ic_camera_shutter.png b/res/drawable-w1024dp-mdpi/button_ic_camera_shutter.png
index 34a36af5..34a36af5 100644
--- a/res/drawable-w1024dp/button_ic_camera_shutter.png
+++ b/res/drawable-w1024dp-mdpi/button_ic_camera_shutter.png
diff --git a/res/drawable-w1024dp/button_ic_camera_shutter_pressed.png b/res/drawable-w1024dp-mdpi/button_ic_camera_shutter_pressed.png
index baa0c3f7..baa0c3f7 100644
--- a/res/drawable-w1024dp/button_ic_camera_shutter_pressed.png
+++ b/res/drawable-w1024dp-mdpi/button_ic_camera_shutter_pressed.png
diff --git a/res/drawable-w1024dp/button_video_shutter_holo.png b/res/drawable-w1024dp-mdpi/button_video_shutter_holo.png
index 8c8b4dfc..8c8b4dfc 100644
--- a/res/drawable-w1024dp/button_video_shutter_holo.png
+++ b/res/drawable-w1024dp-mdpi/button_video_shutter_holo.png
diff --git a/res/drawable-w1024dp/button_video_shutter_pressed_holo.png b/res/drawable-w1024dp-mdpi/button_video_shutter_pressed_holo.png
index 903a57ab..903a57ab 100644
--- a/res/drawable-w1024dp/button_video_shutter_pressed_holo.png
+++ b/res/drawable-w1024dp-mdpi/button_video_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp/ic_time_lapse_holo_dark.png b/res/drawable-w1024dp-mdpi/ic_time_lapse_holo_dark.png
index 2bb9c576..2bb9c576 100644
--- a/res/drawable-w1024dp/ic_time_lapse_holo_dark.png
+++ b/res/drawable-w1024dp-mdpi/ic_time_lapse_holo_dark.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_coloreffect.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_coloreffect.png
index 738ef058..738ef058 100644
--- a/res/drawable-w1024dp/ic_viewfinder_coloreffect.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_coloreffect.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_flash_auto.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_flash_auto.png
index 7b1cb6c5..7b1cb6c5 100644
--- a/res/drawable-w1024dp/ic_viewfinder_flash_auto.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_flash_auto.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_flash_off.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_flash_off.png
index ecf82203..ecf82203 100644
--- a/res/drawable-w1024dp/ic_viewfinder_flash_off.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_flash_off.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_flash_on.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_flash_on.png
index c01a882c..c01a882c 100644
--- a/res/drawable-w1024dp/ic_viewfinder_flash_on.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_flash_on.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_scene_mode.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_scene_mode.png
index d11b0579..d11b0579 100644
--- a/res/drawable-w1024dp/ic_viewfinder_scene_mode.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_scene_mode.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_settings.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_settings.png
index 3093ed74..3093ed74 100644
--- a/res/drawable-w1024dp/ic_viewfinder_settings.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_settings.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_share.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_share.png
index d8f223af..d8f223af 100644
--- a/res/drawable-w1024dp/ic_viewfinder_share.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_share.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_video_quality_high.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_high.png
index 2fcbd8ba..2fcbd8ba 100644
--- a/res/drawable-w1024dp/ic_viewfinder_video_quality_high.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_high.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_video_quality_low.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_low.png
index 9158059d..9158059d 100644
--- a/res/drawable-w1024dp/ic_viewfinder_video_quality_low.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_low.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_video_quality_youtube.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_youtube.png
index 7d279aff..7d279aff 100644
--- a/res/drawable-w1024dp/ic_viewfinder_video_quality_youtube.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_video_quality_youtube.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_wb_auto.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_auto.png
index cf8ddb43..cf8ddb43 100644
--- a/res/drawable-w1024dp/ic_viewfinder_wb_auto.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_auto.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_wb_daylight.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_daylight.png
index 6472b09e..6472b09e 100644
--- a/res/drawable-w1024dp/ic_viewfinder_wb_daylight.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_daylight.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_wb_fluorescent.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_fluorescent.png
index 509f4365..509f4365 100644
--- a/res/drawable-w1024dp/ic_viewfinder_wb_fluorescent.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_fluorescent.png
diff --git a/res/drawable-w1024dp/ic_viewfinder_wb_incandescent.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_incandescent.png
index 1ef4d2ee..1ef4d2ee 100644
--- a/res/drawable-w1024dp/ic_viewfinder_wb_incandescent.png
+++ b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_incandescent.png
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
index 173be1f1..28d65152 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -57,5 +57,5 @@
     <ImageView android:id="@+id/preview_border"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/border_preview_holo"/>
+            android:background="@drawable/border_preview"/>
 </com.android.camera.PreviewFrameLayout>
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
index f3ef82a9..774e0fdd 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -73,5 +73,5 @@
     <ImageView android:id="@+id/preview_border"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/border_preview_holo"/>
+            android:background="@drawable/border_preview"/>
 </com.android.camera.PreviewFrameLayout>
diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml
index 4e95882d..283969f9 100644
--- a/res/layout/preview_frame.xml
+++ b/res/layout/preview_frame.xml
@@ -24,7 +24,7 @@
     <ImageView android:id="@+id/preview_border"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/border_view_finder"/>
+            android:background="@drawable/border_preview"/>
     <RelativeLayout android:id="@+id/frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml
index 7bb8fcc0..07b7938a 100644
--- a/res/layout/preview_frame_video.xml
+++ b/res/layout/preview_frame_video.xml
@@ -23,7 +23,7 @@
     <ImageView android:id="@+id/preview_border"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/border_view_finder"/>
+            android:background="@drawable/border_preview"/>
     <RelativeLayout android:id="@+id/frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index ec7a5f3e..31444c40 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1915,8 +1915,8 @@ public class VideoCamera extends ActivityBase
         }
         if (mPreviewBorder != null) {
             mPreviewBorder.setBackgroundResource(enable
-                    ? R.drawable.border_preview_time_lapse_holo
-                    : R.drawable.border_preview_holo);
+                    ? R.drawable.border_preview_time_lapse
+                    : R.drawable.border_preview);
         }
 
     }