diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-10-12 11:13:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-20 11:25:03 -0700 |
| commit | d48b19dc07840224e7434661c4c5e8ec1a78a67d (patch) | |
| tree | 7ede241a612188147562d5bdc56117c3a496637a /res | |
| parent | e5638a1b4697191588438be133102f61b67a3985 (diff) | |
| download | android_packages_apps_Snap-d48b19dc07840224e7434661c4c5e8ec1a78a67d.tar.gz android_packages_apps_Snap-d48b19dc07840224e7434661c4c5e8ec1a78a67d.tar.bz2 android_packages_apps_Snap-d48b19dc07840224e7434661c4c5e8ec1a78a67d.zip | |
SnapdragonCamera: Blurbuster filter
Adding blurbuster filter to the post processor
Change-Id: I2958a2b1b0df834c4cb5b921e49d21d2e20c8377
CRs-Fixed: 1080317
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/blur_buster.png | bin | 0 -> 2079 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/ic_settings_selfiemirror.png | bin | 1463 -> 0 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/seekbar_hide.png | bin | 0 -> 515 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/seekbar_show.png | bin | 0 -> 457 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_settings_selfiemirror.png | bin | 2319 -> 0 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_settings_selfiemirror.png | bin | 3219 -> 0 bytes | |||
| -rw-r--r-- | res/drawable/ic_settings_selfiemirror.png | bin | 0 -> 2153 bytes | |||
| -rw-r--r-- | res/layout/one_ui_layout.xml | 9 | ||||
| -rw-r--r-- | res/values/camera2arrays.xml | 3 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 1 |
10 files changed, 9 insertions, 4 deletions
diff --git a/res/drawable-hdpi/blur_buster.png b/res/drawable-hdpi/blur_buster.png Binary files differnew file mode 100644 index 000000000..3c9818728 --- /dev/null +++ b/res/drawable-hdpi/blur_buster.png diff --git a/res/drawable-hdpi/ic_settings_selfiemirror.png b/res/drawable-hdpi/ic_settings_selfiemirror.png Binary files differdeleted file mode 100644 index 870093c57..000000000 --- a/res/drawable-hdpi/ic_settings_selfiemirror.png +++ /dev/null diff --git a/res/drawable-hdpi/seekbar_hide.png b/res/drawable-hdpi/seekbar_hide.png Binary files differnew file mode 100644 index 000000000..a8a3788c3 --- /dev/null +++ b/res/drawable-hdpi/seekbar_hide.png diff --git a/res/drawable-hdpi/seekbar_show.png b/res/drawable-hdpi/seekbar_show.png Binary files differnew file mode 100644 index 000000000..ed84408a1 --- /dev/null +++ b/res/drawable-hdpi/seekbar_show.png diff --git a/res/drawable-xhdpi/ic_settings_selfiemirror.png b/res/drawable-xhdpi/ic_settings_selfiemirror.png Binary files differdeleted file mode 100644 index 692476577..000000000 --- a/res/drawable-xhdpi/ic_settings_selfiemirror.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_settings_selfiemirror.png b/res/drawable-xxhdpi/ic_settings_selfiemirror.png Binary files differdeleted file mode 100644 index 988d95866..000000000 --- a/res/drawable-xxhdpi/ic_settings_selfiemirror.png +++ /dev/null diff --git a/res/drawable/ic_settings_selfiemirror.png b/res/drawable/ic_settings_selfiemirror.png Binary files differnew file mode 100644 index 000000000..7d99f5c2c --- /dev/null +++ b/res/drawable/ic_settings_selfiemirror.png diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index e8162197a..2a87b6cd2 100644 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -90,12 +90,13 @@ android:layout_height="wrap_content" android:id="@+id/makeup_seekbar_layout" android:visibility="gone"> - <Button + <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/seekbar_toggle" - android:text="@string/makeup_seekbar_low"> - </Button> + android:paddingLeft="5dp" + android:paddingRight="5dp" + android:id="@+id/seekbar_toggle"> + </ImageView> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 438d1389a..b1c3a5b7c 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -153,6 +153,7 @@ <item>-1</item> <item>103</item> <item>105</item> + <item>106</item> <item>104</item> </string-array> @@ -176,6 +177,7 @@ <item>@string/pref_camera_scenemode_entry_asd</item> <item>@string/pref_camera_scenemode_entry_bestpicture</item> <item>@string/pref_camera_scenemode_entry_chromaflash</item> + <item>@string/pref_camera_scenemode_entry_blurbuster</item> <item>@string/pref_camera_scenemode_entry_panorama</item> </string-array> @@ -198,6 +200,7 @@ <item>@drawable/ic_scene_mode_smartauto</item> <item>@drawable/pick_the_best_photo</item> <item>@drawable/chroma_flash</item> + <item>@drawable/blur_buster</item> <item>@drawable/scene_panorama</item> </array> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 72fab56e0..64bd8127a 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1025,6 +1025,7 @@ <string name="pref_camera2_trackingfocus_title" translatable="true">Tracking Focus</string> <string name="pref_camera_scenemode_entry_bestpicture" translatable="true">BestPicture</string> <string name="pref_camera_scenemode_entry_chromaflash" translatable="true">ChromaFlash</string> + <string name="pref_camera_scenemode_entry_blurbuster" translatable="true">BlurBuster</string> <string name="pref_camera_scenemode_entry_panorama" translatable="true">Panorama</string> <string name="bestpicture_done" translatable="true">DONE</string> <string name="bestpicture_at_least_one_picture" translatable="true">At least, one picture has to be chosen.</string> |
