Merge "Removing unused UI fields in FilterRepresentation." into gb-ub-photos-carlsbad
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index b4ec436..d917990 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -13,15 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.camera.ui.NewCameraRootView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/camera_app_root"
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <!-- NewCameraRootView needs to be in a FrameLayout to set margins
- in the layout parameters. -->
- <com.android.camera.ui.NewCameraRootView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/camera_app_root"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
- </com.android.camera.ui.NewCameraRootView>
-</FrameLayout>
+</com.android.camera.ui.NewCameraRootView>
diff --git a/res/layout/secure_album_placeholder.xml b/res/layout/secure_album_placeholder.xml
new file mode 100644
index 0000000..8d9a229
--- /dev/null
+++ b/res/layout/secure_album_placeholder.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:background="@color/photo_placeholder"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:scaleType="center"
+ android:src="@drawable/placeholder_locked"
+/>