diff options
author | Camera Software Integration <camswint@localhost> | 2017-03-09 06:32:20 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-09 06:32:20 -0800 |
commit | 846ee0c2e67a5b50f29d7732dab6197ba346e53c (patch) | |
tree | e0b09776bee1270764595a856c63def4794f315c /res | |
parent | b7d5dd4620319193c241eb4a50001c03bc392a4b (diff) | |
parent | 41cabf1499bdd5465c403d39a10742baef454192 (diff) | |
download | android_packages_apps_Snap-846ee0c2e67a5b50f29d7732dab6197ba346e53c.tar.gz android_packages_apps_Snap-846ee0c2e67a5b50f29d7732dab6197ba346e53c.tar.bz2 android_packages_apps_Snap-846ee0c2e67a5b50f29d7732dab6197ba346e53c.zip |
Merge "SnapdragonCamera: fix W+T UI issues" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
-rwxr-xr-x | res/layout/photo_module.xml | 5 | ||||
-rwxr-xr-x | res/xml/camera_preferences.xml | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index c55433b3f..d65dbd4f6 100755 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -117,11 +117,12 @@ android:id="@+id/blur_degree_bar" android:orientation="horizontal" android:layout_gravity="bottom" - android:paddingBottom="80dp" + android:paddingBottom="130dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="30dip" android:layout_marginLeft="30dip" - android:layout_marginRight="30dip" /> + android:layout_marginRight="30dip" + android:visibility="gone"/> </FrameLayout> </merge> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index dc73d10da..bf9263ca4 100755 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -397,9 +397,7 @@ <ListPreference camera:key="pref_camera_bokeh_blur_degree_key" camera:defaultValue="@string/pref_camera_bokeh_blur_degree_default" - camera:title="@string/pref_camera_bokeh_blur_degree_title" - camera:entries="@array/pref_camera_bokeh_blur_degree_entries" - camera:entryValues="@array/pref_camera_bokeh_blur_degree_entry_values" /> + camera:title="@string/pref_camera_bokeh_blur_degree_title"/> <ListPreference |