diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2014-10-01 16:43:19 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-17 17:54:51 -0800 |
commit | 74dbd7a70f07f6c3e0e1e3f9a83d7102c681d076 (patch) | |
tree | 36a91986b528647a52259173ea80a5f5f125bab7 /res | |
parent | 41d18fed018678492323150c661f2b9f6c8931a8 (diff) | |
download | android_packages_apps_Snap-74dbd7a70f07f6c3e0e1e3f9a83d7102c681d076.tar.gz android_packages_apps_Snap-74dbd7a70f07f6c3e0e1e3f9a83d7102c681d076.tar.bz2 android_packages_apps_Snap-74dbd7a70f07f6c3e0e1e3f9a83d7102c681d076.zip |
SnapdragonCamera: Update UI with new icons and setting menus
Updating icons and settings menus for SnapdragonCamera UI
Change-Id: Id7db7d624a517f76f5bd5941ed113e8d13d6aca1
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_scene_mode_auto.png | bin | 12892 -> 2434 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_settings_filter.png | bin | 12892 -> 5305 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_scene_mode_auto.png | bin | 6394 -> 1398 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_settings_filter.png | bin | 6394 -> 3954 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_scene_mode_auto.png | bin | 23597 -> 3502 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_settings_filter.png | bin | 23597 -> 23597 bytes | |||
-rw-r--r-- | res/drawable/thumb_filter_sketch.png | bin | 43786 -> 26261 bytes | |||
-rw-r--r-- | res/layout/filter_mode_view.xml | 8 | ||||
-rw-r--r-- | res/layout/scene_mode_view.xml | 8 | ||||
-rw-r--r-- | res/values/dimens.xml | 7 | ||||
-rw-r--r-- | res/values/strings.xml | 2 |
11 files changed, 16 insertions, 9 deletions
diff --git a/res/drawable-hdpi/ic_scene_mode_auto.png b/res/drawable-hdpi/ic_scene_mode_auto.png Binary files differindex 6b18e9061..c9142c947 100644 --- a/res/drawable-hdpi/ic_scene_mode_auto.png +++ b/res/drawable-hdpi/ic_scene_mode_auto.png diff --git a/res/drawable-hdpi/ic_settings_filter.png b/res/drawable-hdpi/ic_settings_filter.png Binary files differindex 35841c2aa..23abfa623 100644 --- a/res/drawable-hdpi/ic_settings_filter.png +++ b/res/drawable-hdpi/ic_settings_filter.png diff --git a/res/drawable-mdpi/ic_scene_mode_auto.png b/res/drawable-mdpi/ic_scene_mode_auto.png Binary files differindex 8dd66bab3..ea3740cbf 100644 --- a/res/drawable-mdpi/ic_scene_mode_auto.png +++ b/res/drawable-mdpi/ic_scene_mode_auto.png diff --git a/res/drawable-mdpi/ic_settings_filter.png b/res/drawable-mdpi/ic_settings_filter.png Binary files differindex 08b4dab43..6b5c2a225 100644 --- a/res/drawable-mdpi/ic_settings_filter.png +++ b/res/drawable-mdpi/ic_settings_filter.png diff --git a/res/drawable-xhdpi/ic_scene_mode_auto.png b/res/drawable-xhdpi/ic_scene_mode_auto.png Binary files differindex 19a4a2ae0..511f29bf5 100644 --- a/res/drawable-xhdpi/ic_scene_mode_auto.png +++ b/res/drawable-xhdpi/ic_scene_mode_auto.png diff --git a/res/drawable-xhdpi/ic_settings_filter.png b/res/drawable-xhdpi/ic_settings_filter.png Binary files differindex 9d47006dc..cc8736189 100644 --- a/res/drawable-xhdpi/ic_settings_filter.png +++ b/res/drawable-xhdpi/ic_settings_filter.png diff --git a/res/drawable/thumb_filter_sketch.png b/res/drawable/thumb_filter_sketch.png Binary files differindex baca1d4f0..cfd0f55a3 100644 --- a/res/drawable/thumb_filter_sketch.png +++ b/res/drawable/thumb_filter_sketch.png diff --git a/res/layout/filter_mode_view.xml b/res/layout/filter_mode_view.xml index a58e725bd..dfa036c1f 100644 --- a/res/layout/filter_mode_view.xml +++ b/res/layout/filter_mode_view.xml @@ -27,11 +27,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="@dimen/filter_mode_width" + android:layout_height="@dimen/filter_mode_height" android:layout_gravity="center" android:orientation="vertical" - android:padding="7dp" > + android:padding="@dimen/filter_mode_padding" > <ImageView android:id="@+id/image" @@ -54,4 +54,4 @@ android:textSize="13sp" android:textStyle="bold" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/scene_mode_view.xml b/res/layout/scene_mode_view.xml index 14e6d5d87..e8a9499d6 100644 --- a/res/layout/scene_mode_view.xml +++ b/res/layout/scene_mode_view.xml @@ -31,12 +31,12 @@ android:layout_height="match_parent" android:layout_gravity="center" android:orientation="vertical" - android:padding="5dp" > + android:padding="@dimen/scene_mode_padding" > <LinearLayout android:id="@+id/border" - android:layout_width="90dp" - android:layout_height="85dp" + android:layout_width="@dimen/scene_mode_width" + android:layout_height="@dimen/scene_mode_height" android:layout_gravity="center" android:background="@drawable/scene_mode_view_border" android:orientation="vertical" @@ -64,4 +64,4 @@ android:textStyle="bold" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index f9a7ff047..6b81ab906 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -157,4 +157,11 @@ <dimen name="photoeditor_text_padding">10dp</dimen> <dimen name="photoeditor_original_text_size">18dp</dimen> <dimen name="photoeditor_original_text_margin">4dp</dimen> + + <dimen name="scene_mode_height">85dp</dimen> + <dimen name="scene_mode_width">90dp</dimen> + <dimen name="scene_mode_padding">10dp</dimen> + <dimen name="filter_mode_height">100dp</dimen> + <dimen name="filter_mode_width">80dp</dimen> + <dimen name="filter_mode_padding">10dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 2d3aee027..63de736bc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -372,7 +372,7 @@ <string name="pref_camera_scenemode_title">Scene mode</string> <!-- Settings menu, scene mode choices [CHAR LIMIT=16] --> - <string name="pref_camera_scenemode_entry_auto">Auto</string> + <string name="pref_camera_scenemode_entry_auto">Automatic</string> <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] --> <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string> <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] --> |