diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-19 15:03:15 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-19 15:03:15 -0800 |
commit | fdccca6a26f8d0bdd556e2e80749e8219e2fa3b5 (patch) | |
tree | e3b3b884358e3f1d20922113ede96beb44a6b5e2 | |
parent | dc784338c0c9c99433417ad9c72e503ae50ff3c2 (diff) | |
parent | 74dbd7a70f07f6c3e0e1e3f9a83d7102c681d076 (diff) | |
download | android_packages_apps_Snap-fdccca6a26f8d0bdd556e2e80749e8219e2fa3b5.tar.gz android_packages_apps_Snap-fdccca6a26f8d0bdd556e2e80749e8219e2fa3b5.tar.bz2 android_packages_apps_Snap-fdccca6a26f8d0bdd556e2e80749e8219e2fa3b5.zip |
Merge "SnapdragonCamera: Update UI with new icons and setting menus"
-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 | ||||
-rw-r--r-- | src/com/android/camera/CustomPhotoMenu.java | 54 | ||||
-rw-r--r-- | src/com/android/camera/CustomVideoMenu.java | 14 | ||||
-rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 2 |
14 files changed, 59 insertions, 36 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] --> diff --git a/src/com/android/camera/CustomPhotoMenu.java b/src/com/android/camera/CustomPhotoMenu.java index 93afac250..f8230c0c2 100644 --- a/src/com/android/camera/CustomPhotoMenu.java +++ b/src/com/android/camera/CustomPhotoMenu.java @@ -134,37 +134,31 @@ public class CustomPhotoMenu extends MenuController } mOtherKeys1 = new String[] { - CameraSettings.KEY_SCENE_MODE, CameraSettings.KEY_RECORD_LOCATION, CameraSettings.KEY_PICTURE_SIZE, CameraSettings.KEY_JPEG_QUALITY, CameraSettings.KEY_TIMER, CameraSettings.KEY_CAMERA_SAVEPATH, CameraSettings.KEY_LONGSHOT, - CameraSettings.KEY_COLOR_EFFECT, CameraSettings.KEY_FACE_DETECTION, CameraSettings.KEY_ISO, CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, - CameraSettings.KEY_FLASH_MODE, CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION }; mOtherKeys2 = new String[] { - CameraSettings.KEY_SCENE_MODE, CameraSettings.KEY_RECORD_LOCATION, CameraSettings.KEY_PICTURE_SIZE, CameraSettings.KEY_JPEG_QUALITY, CameraSettings.KEY_TIMER, CameraSettings.KEY_CAMERA_SAVEPATH, CameraSettings.KEY_LONGSHOT, - CameraSettings.KEY_COLOR_EFFECT, CameraSettings.KEY_FACE_DETECTION, CameraSettings.KEY_ISO, CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, - CameraSettings.KEY_FLASH_MODE, CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION, CameraSettings.KEY_HISTOGRAM, @@ -621,17 +615,7 @@ public class CustomPhotoMenu extends MenuController public void initSceneModeButton(View button) { button.setVisibility(View.INVISIBLE); - final IconListPreference pref = (IconListPreference) mPreferenceGroup - .findPreference(CameraSettings.KEY_SCENE_MODE); - if (pref == null) - return; - - int[] iconIds = pref.getLargeIconIds(); - int resid = -1; - // The preference only has a single icon to represent it. - resid = pref.getSingleIcon(); - ImageView iv = (ImageView) ((FrameLayout) button).getChildAt(0); - iv.setImageResource(resid); + updateSceneModeIcon(); button.setVisibility(View.VISIBLE); button.setOnClickListener(new OnClickListener() { @Override @@ -670,12 +654,18 @@ public class CustomPhotoMenu extends MenuController int[] thumbnails = pref.getThumbnailIds(); + Resources r = mActivity.getResources(); + int height = (int) (r.getDimension(R.dimen.scene_mode_height) + 2 + * r.getDimension(R.dimen.scene_mode_padding) + 1); + int width = (int) (r.getDimension(R.dimen.scene_mode_width) + 2 + * r.getDimension(R.dimen.scene_mode_padding) + 1); + int gridRes = 0; boolean portrait = (rotation == 0) || (rotation == 180); - int size = Math.min(display.getWidth(), display.getHeight()) * 30 / 100; + int size = height; if (portrait) { gridRes = R.layout.vertical_grid; - size = Math.min(display.getWidth(), display.getHeight()) * 30 / 100; + size = width; } else { gridRes = R.layout.horiz_grid; } @@ -725,11 +715,11 @@ public class CustomPhotoMenu extends MenuController public boolean onTouch(View v, MotionEvent event) { if (event.getAction() == MotionEvent.ACTION_DOWN) { startTime = System.currentTimeMillis(); - } else if (event.getAction() == MotionEvent.ACTION_UP) { if (System.currentTimeMillis() - startTime < CLICK_THRESHOLD) { pref.setValueIndex(j); onSettingChanged(pref); + updateSceneModeIcon(); for (View v1 : views) { v1.setBackgroundResource(R.drawable.scene_mode_view_border); } @@ -754,6 +744,19 @@ public class CustomPhotoMenu extends MenuController mPreviewMenu = basic; } + public void updateSceneModeIcon() { + final IconListPreference pref = (IconListPreference) mPreferenceGroup + .findPreference(CameraSettings.KEY_SCENE_MODE); + if (pref == null) + return; + ImageView iv = (ImageView) ((FrameLayout) mSceneModeSwitcher).getChildAt(0); + int[] thumbnails = pref.getThumbnailIds(); + int ind = pref.getCurrentIndex(); + if (ind == -1) + ind = 0; + iv.setImageResource(thumbnails[ind]); + } + public void initFilterModeButton(View button) { button.setVisibility(View.INVISIBLE); final IconListPreference pref = (IconListPreference) mPreferenceGroup @@ -792,12 +795,19 @@ public class CustomPhotoMenu extends MenuController WindowManager wm = (WindowManager) mActivity.getSystemService(Context.WINDOW_SERVICE); Display display = wm.getDefaultDisplay(); CharSequence[] entries = pref.getEntries(); + + Resources r = mActivity.getResources(); + int height = (int) (r.getDimension(R.dimen.filter_mode_height) + 2 + * r.getDimension(R.dimen.filter_mode_padding) + 1); + int width = (int) (r.getDimension(R.dimen.filter_mode_width) + 2 + * r.getDimension(R.dimen.filter_mode_padding) + 1); + int gridRes = 0; boolean portrait = (rotation == 0) || (rotation == 180); - int size = Math.min(display.getWidth(), display.getHeight()) * 35 / 100; + int size = height; if (portrait) { gridRes = R.layout.vertical_grid; - size = Math.min(display.getWidth(), display.getHeight()) * 30 / 100; + size = width; } else { gridRes = R.layout.horiz_grid; } diff --git a/src/com/android/camera/CustomVideoMenu.java b/src/com/android/camera/CustomVideoMenu.java index 0bf0095f6..6c4eadae9 100644 --- a/src/com/android/camera/CustomVideoMenu.java +++ b/src/com/android/camera/CustomVideoMenu.java @@ -22,6 +22,7 @@ package com.android.camera; import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.content.Context; +import android.content.res.Resources; import android.content.SharedPreferences; import android.graphics.Rect; import android.preference.PreferenceManager; @@ -104,7 +105,6 @@ public class CustomVideoMenu extends MenuController CameraSettings.KEY_VIDEO_DURATION, CameraSettings.KEY_RECORD_LOCATION, CameraSettings.KEY_CAMERA_SAVEPATH, - CameraSettings.KEY_COLOR_EFFECT, CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE @@ -114,7 +114,6 @@ public class CustomVideoMenu extends MenuController CameraSettings.KEY_VIDEO_DURATION, CameraSettings.KEY_RECORD_LOCATION, CameraSettings.KEY_CAMERA_SAVEPATH, - CameraSettings.KEY_COLOR_EFFECT, CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, @@ -468,12 +467,19 @@ public class CustomVideoMenu extends MenuController WindowManager wm = (WindowManager) mActivity.getSystemService(Context.WINDOW_SERVICE); Display display = wm.getDefaultDisplay(); CharSequence[] entries = pref.getEntries(); + + Resources r = mActivity.getResources(); + int height = (int) (r.getDimension(R.dimen.filter_mode_height) + 2 + * r.getDimension(R.dimen.filter_mode_padding) + 1); + int width = (int) (r.getDimension(R.dimen.filter_mode_width) + 2 + * r.getDimension(R.dimen.filter_mode_padding) + 1); + int gridRes = 0; boolean portrait = (rotation == 0) || (rotation == 180); - int size = Math.min(display.getWidth(), display.getHeight()) * 35 / 100; + int size = height; if (portrait) { gridRes = R.layout.vertical_grid; - size = Math.min(display.getWidth(), display.getHeight()) * 30 / 100; + size = width; } else { gridRes = R.layout.horiz_grid; } diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 5c305acd8..aeaa0d4e7 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -234,7 +234,7 @@ public class CameraControls extends RotatableLayout { Rect shutter = new Rect(); topRight(mPreview, l, t, r, b); center(mShutter, l, t, r, b, orientation, rotation, shutter, SHUTTER_INDEX); - mSize = Math.max(shutter.right - shutter.left, shutter.bottom - shutter.top); + mSize = (int) (Math.max(shutter.right - shutter.left, shutter.bottom - shutter.top) * 1.2f); center(mBackgroundView, l, t, r, b, orientation, rotation, new Rect(), -1); mBackgroundView.setVisibility(View.GONE); setLocation(r - l, b - t); |