Update AOSP Camera product icon

Final updates for the icon. Keeping naming consistent with generated
assets.

Bug: 16985499
Change-Id: I389c2479b208dec05a0b3a1f2617d13b15913dcb
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b38c700..435c48e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,7 +42,7 @@
     <application
         android:name="com.android.camera.app.CameraApp"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_camera_clr_48dp"
+        android:icon="@drawable/logo_camera_color_44in48dp"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:restoreAnyVersion="true"
diff --git a/res_p/drawable-hdpi/ic_camera_clr_48dp.png b/res_p/drawable-hdpi/ic_camera_clr_48dp.png
deleted file mode 100644
index 008a752..0000000
--- a/res_p/drawable-hdpi/ic_camera_clr_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res_p/drawable-hdpi/logo_camera_color_44in48dp.png b/res_p/drawable-hdpi/logo_camera_color_44in48dp.png
new file mode 100644
index 0000000..1ac6b58
--- /dev/null
+++ b/res_p/drawable-hdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-mdpi/ic_camera_clr_48dp.png b/res_p/drawable-mdpi/ic_camera_clr_48dp.png
deleted file mode 100644
index ed974c9..0000000
--- a/res_p/drawable-mdpi/ic_camera_clr_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res_p/drawable-mdpi/logo_camera_color_44in48dp.png b/res_p/drawable-mdpi/logo_camera_color_44in48dp.png
new file mode 100644
index 0000000..3868f15
--- /dev/null
+++ b/res_p/drawable-mdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-xhdpi/ic_camera_clr_48dp.png b/res_p/drawable-xhdpi/ic_camera_clr_48dp.png
deleted file mode 100644
index 4e73cb6..0000000
--- a/res_p/drawable-xhdpi/ic_camera_clr_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res_p/drawable-xhdpi/logo_camera_color_44in48dp.png b/res_p/drawable-xhdpi/logo_camera_color_44in48dp.png
new file mode 100644
index 0000000..7593dc3
--- /dev/null
+++ b/res_p/drawable-xhdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-xxhdpi/ic_camera_clr_48dp.png b/res_p/drawable-xxhdpi/ic_camera_clr_48dp.png
deleted file mode 100644
index 3479453..0000000
--- a/res_p/drawable-xxhdpi/ic_camera_clr_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png b/res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png
new file mode 100644
index 0000000..a989efe
--- /dev/null
+++ b/res_p/drawable-xxhdpi/logo_camera_color_44in48dp.png
Binary files differ
diff --git a/res_p/drawable-xxxhdpi/ic_camera_clr_48dp.png b/res_p/drawable-xxxhdpi/ic_camera_clr_48dp.png
deleted file mode 100644
index e3a18c2..0000000
--- a/res_p/drawable-xxxhdpi/ic_camera_clr_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png b/res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png
new file mode 100644
index 0000000..9264c34
--- /dev/null
+++ b/res_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png
Binary files differ