Add other settings to control panel.

Head-up display is removed from xlarge devices.

Change-Id: I4e05076ae368a7e288d56a092ffb92e9eee8376e

4 files changed, 119 insertions, 2 deletions

diff --git a/res/layout-xlarge/setting_picker.xml b/res/layout-xlarge/basic_setting_picker.xml
index 88b03ef..88b03ef 100644
--- a/res/layout-xlarge/setting_picker.xml
+++ b/res/layout-xlarge/basic_setting_picker.xml
diff --git a/res/layout-xlarge/in_line_setting_picker.xml b/res/layout-xlarge/in_line_setting_picker.xml
new file mode 100644
index 0000000..a2387ae
--- /dev/null
+++ b/res/layout-xlarge/in_line_setting_picker.xml
@@ -0,0 +1,51 @@
+<?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.
+*/
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <Button android:id="@+id/decrement"
+        android:layout_width="24dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:gravity="center"
+        android:text="@string/setting_decrement"
+        android:textColor="@drawable/btn_setting_picker"
+        android:textSize="20dp"
+        android:textStyle="bold"
+        android:background="@android:color/transparent" />
+
+    <TextView android:id="@+id/current_setting"
+        android:layout_width="130dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:gravity="center"
+        android:singleLine="true"
+        android:textColor="@android:color/white"
+        android:textSize="20dp" />
+
+    <Button android:id="@+id/increment"
+        android:layout_width="24dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:gravity="center"
+        android:text="@string/setting_increment"
+        android:textColor="@drawable/btn_setting_picker"
+        android:textSize="20dp"
+        android:textStyle="bold"
+        android:background="@android:color/transparent" />
+</merge>
diff --git a/res/layout-xlarge/other_setting_picker.xml b/res/layout-xlarge/other_setting_picker.xml
new file mode 100644
index 0000000..9d5ccfe
--- /dev/null
+++ b/res/layout-xlarge/other_setting_picker.xml
@@ -0,0 +1,66 @@
+<?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.
+*/
+-->
+
+<TableLayout 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" >
+
+    <TableRow style="@style/OtherSettingTableRow">
+        <TextView android:text="@string/pref_camera_recordlocation_title"
+            style="@style/SettingPickerText" />
+        <com.android.camera.ui.InLineSettingPicker
+            camera:prefKey="pref_camera_recordlocation_key" />
+    </TableRow>
+
+    <TableRow style="@style/OtherSettingTableRow">
+        <TextView android:text="@string/pref_camera_focusmode_title"
+            style="@style/SettingPickerText"  />
+        <com.android.camera.ui.InLineSettingPicker
+            camera:prefKey="pref_camera_focusmode_key" />
+    </TableRow>
+
+    <TableRow style="@style/OtherSettingTableRow">
+        <TextView android:text="@string/pref_exposure_title"
+            style="@style/SettingPickerText"  />
+        <com.android.camera.ui.InLineSettingPicker
+            camera:prefKey="pref_camera_exposure_key" />
+    </TableRow>
+
+    <TableRow style="@style/OtherSettingTableRow">
+        <TextView android:text="@string/pref_camera_picturesize_title"
+            style="@style/SettingPickerText"  />
+        <com.android.camera.ui.InLineSettingPicker
+            camera:prefKey="pref_camera_picturesize_key" />
+    </TableRow>
+
+    <TableRow style="@style/OtherSettingTableRow">
+        <TextView android:text="@string/pref_camera_jpegquality_title"
+            style="@style/SettingPickerText"  />
+        <com.android.camera.ui.InLineSettingPicker
+            camera:prefKey="pref_camera_jpegquality_key" />
+    </TableRow>
+
+    <TableRow style="@style/OtherSettingTableRow">
+        <TextView android:text="@string/pref_camera_scenemode_title"
+            style="@style/SettingPickerText"  />
+        <com.android.camera.ui.InLineSettingPicker
+            camera:prefKey="pref_camera_scenemode_key" />
+    </TableRow>
+</TableLayout>
diff --git a/res/layout-xlarge/zoom_picker.xml b/res/layout-xlarge/zoom_picker.xml
index 50766d4..fa373f4 100644
--- a/res/layout-xlarge/zoom_picker.xml
+++ b/res/layout-xlarge/zoom_picker.xml
@@ -17,7 +17,7 @@
 */
 -->
 
-<com.android.camera.ZoomPicker xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.camera.ui.ZoomPicker xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -40,4 +40,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/btn_zoom_picker_down" />
-</com.android.camera.ZoomPicker>
+</com.android.camera.ui.ZoomPicker>