resolved conflicts for merge of aae0cba5 to master

Change-Id: I681c7f38abaed6705640c4e79e06a581990ec496

1 files changed, 53 insertions, 0 deletions

diff --git a/res/layout-w1024dp/other_setting_popup.xml b/res/layout-w1024dp/other_setting_popup.xml
new file mode 100644
index 0000000..a0bdb61
--- /dev/null
+++ b/res/layout-w1024dp/other_setting_popup.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.
+*/
+-->
+
+<com.android.camera.ui.OtherSettingsPopup xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="229dp"
+        android:orientation="vertical"
+        android:visibility="invisible">
+
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/dialog_top_holo_dark"
+            android:minHeight="48dp">
+        <TextView android:id="@+id/title"
+                android:text="@string/pref_camera_settings_category"
+                style="@style/SettingTitleText" />
+    </FrameLayout>
+
+    <FrameLayout
+            android:layout_width="590dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/dialog_bottom_holo_dark">
+        <ListView android:id="@+id/settingList"
+                android:orientation="vertical"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:paddingBottom="3dp"
+                android:layout_gravity="center"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+    </FrameLayout>
+</com.android.camera.ui.OtherSettingsPopup>