diff options
author | junjiez <junjiez@codeaurora.org> | 2017-06-29 13:44:15 +0800 |
---|---|---|
committer | junjiez <junjiez@codeaurora.org> | 2017-07-26 15:28:52 +0800 |
commit | ef407574ede2694755abbd5a872936623030c1d7 (patch) | |
tree | d89371f4fdc74d928f032bc6bba3d921a0bad01d /src/com/android/camera/PhotoMenu.java | |
parent | 73c61caa5c7d17f02153bd559e5dbe340dbff245 (diff) | |
download | android_packages_apps_Snap-ef407574ede2694755abbd5a872936623030c1d7.tar.gz android_packages_apps_Snap-ef407574ede2694755abbd5a872936623030c1d7.tar.bz2 android_packages_apps_Snap-ef407574ede2694755abbd5a872936623030c1d7.zip |
SnapdragonCamera:RTB UI
1.add a new icon on the top of camera
control to enable bokeh mode.
2.add toast to show the distance,lighting
and effect alert.
3.add debug mode to save all the images
received from HAL separately
4.modify ui according to the spec
Change-Id: I1178015f48c29cade4e14bb531c9727665905fec
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 7debfc7ef..083647bf9 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -98,6 +98,7 @@ public class PhotoMenu extends MenuController private int mSceneStatus; private View mHdrSwitcher; private View mTsMakeupSwitcher; + private View mBokehSwitcher; private View mFrontBackSwitcher; private View mSceneModeSwitcher; private View mFilterModeSwitcher; @@ -132,6 +133,7 @@ public class PhotoMenu extends MenuController mHdrSwitcher = ui.getRootView().findViewById(R.id.hdr_switcher); mTsMakeupSwitcher = ui.getRootView().findViewById(R.id.ts_makeup_switcher); mSceneModeSwitcher = ui.getRootView().findViewById(R.id.scene_mode_switcher); + mBokehSwitcher = ui.getRootView().findViewById(R.id.bokeh_switcher); mFilterModeSwitcher = ui.getRootView().findViewById(R.id.filter_mode_switcher); mMakeupListener = makeupListener; mSettingMenu = ui.getRootView().findViewById(R.id.menu); @@ -167,6 +169,7 @@ public class PhotoMenu extends MenuController } else { mHdrSwitcher.setVisibility(View.INVISIBLE); } + initBokehModeButton(mBokehSwitcher); mFrontBackSwitcher.setVisibility(View.INVISIBLE); if(!TsMakeupManager.HAS_TS_MAKEUP) { @@ -848,6 +851,49 @@ public class PhotoMenu extends MenuController }); } + public void initBokehModeButton(View button) { + button.setVisibility(View.INVISIBLE); + final IconListPreference pref = (IconListPreference) mPreferenceGroup.findPreference( + CameraSettings.KEY_BOKEH_MODE); + if (pref == null) { + button.setVisibility(View.GONE); + return; + } + + int[] iconIds = pref.getLargeIconIds(); + int resid = -1; + int index = pref.findIndexOfValue(pref.getValue()); + if (!pref.getUseSingleIcon() && iconIds != null) { + resid = iconIds[index]; + } else { + resid = pref.getSingleIcon(); + } + ImageView iv = (ImageView) button; + iv.setImageResource(resid); + + button.setVisibility(View.VISIBLE); + + button.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + ListPreference bokehPref = + mPreferenceGroup.findPreference(CameraSettings.KEY_BOKEH_MODE); + String bokeh = (bokehPref != null) ? bokehPref.getValue() : null; + if (bokeh != null) { + CharSequence[] values = bokehPref.getEntryValues(); + int index = (bokehPref.getCurrentIndex() + 1) % values.length; + bokehPref.setValueIndex(index); + ((ImageView) v).setImageResource( + ((IconListPreference) pref).getLargeIconIds()[index]); + reloadPreference(pref); + onSettingChanged(bokehPref); + } else { + + } + } + }); + } + public void initMakeupModeButton(View button) { if(!TsMakeupManager.HAS_TS_MAKEUP) { return; |