diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-28 10:10:19 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-28 10:10:19 -0800 |
| commit | 07cf80cc97c68f12d5728919fcebba28e750761d (patch) | |
| tree | a8ab18837e0858a45a5e74268d8731dd948f39c7 /res | |
| parent | 9c9d5d3ba97c03f17dc551c6fdd4b8294d6b98d3 (diff) | |
| parent | 9fa172008ae2c5c83f78f4809cd6430d36bb0287 (diff) | |
| download | android_packages_apps_Snap-07cf80cc97c68f12d5728919fcebba28e750761d.tar.gz android_packages_apps_Snap-07cf80cc97c68f12d5728919fcebba28e750761d.tar.bz2 android_packages_apps_Snap-07cf80cc97c68f12d5728919fcebba28e750761d.zip | |
Merge "SnapdragonCamera: Add Portrait to scene mode"
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/photo_module.xml | 42 | ||||
| -rw-r--r-- | res/values/arrays.xml | 8 |
2 files changed, 5 insertions, 45 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index 9407e1af9..c6d895771 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -66,48 +66,6 @@ android:layout_height="200dip" android:layout_marginTop="15dip" android:layout_marginLeft="15dip" /> - <TableLayout - android:id="@+id/relative_seek" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="20px" - android:layout_marginRight="20px" - android:layout_marginLeft="20px" - android:stretchColumns="1"> - <TableRow> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:id="@+id/skintonetitle" - android:layout_gravity="center" - android:textSize="22.0sp" - android:textStyle="bold" /> - </TableRow> - <TableRow> - <SeekBar - android:id="@+id/skintoneseek" - android:layout_below="@+id/skintonetitle" - android:layout_width="match_parent" - android:maxWidth="400px" - android:layout_height="33dip" - android:layout_marginLeft="25px" - android:layout_marginTop="2dip"/> - </TableRow> - <TableRow> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:id="@+id/skintoneleft" - android:textSize="22.0sp" - android:textStyle="bold" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:id="@+id/skintoneright" - android:textSize="22.0sp" - android:textStyle="bold"/> - </TableRow> - </TableLayout> </RelativeLayout> <ImageView android:id="@+id/review_image" diff --git a/res/values/arrays.xml b/res/values/arrays.xml index bb87126b2..7ea20d331 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -398,7 +398,7 @@ <string-array name="pref_camera_scenemode_entries" translatable="false"> <item>@string/pref_camera_scenemode_entry_auto</item> <item>@string/pref_camera_scenemode_entry_refocus</item> - <!-- <item>@string/pref_camera_scenemode_entry_portrait</item> --> + <item>@string/pref_camera_scenemode_entry_portrait</item> <item>@string/pref_camera_scenemode_entry_landscape</item> <item>@string/pref_camera_scenemode_entry_sports</item> <item>@string/pref_camera_scenemode_entry_flowers</item> @@ -413,7 +413,8 @@ <array name="scenemode_thumbnails" translatable="false"> <item>@drawable/ic_scene_mode_auto</item> <item>@drawable/ic_scene_mode_refocus</item> - <!-- <item>@drawable/ic_scene_mode_portrait</item> --> + <item>@drawable/ic_scene_mode_portrait</item> + <item>@drawable/ic_scene_mode_portrait</item> <item>@drawable/ic_scene_mode_landscape</item> <item>@drawable/ic_scene_mode_sports</item> <item>@drawable/ic_scene_mode_flower</item> @@ -443,8 +444,9 @@ <string-array name="pref_camera_scenemode_entryvalues" translatable="false"> <item>auto</item> + <item>@string/pref_camera_advanced_feature_value_refocus_on</item> - <!-- <item>portrait</item> --> + <item>portrait</item> <item>landscape</item> <item>sports</item> <item>flowers</item> |