diff options
author | Steve Kondik <steve@cyngn.com> | 2016-11-09 00:08:42 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-11-13 23:33:36 -0800 |
commit | 4538ee80f8a9eb338281db00fb349e111eeb5aaf (patch) | |
tree | bb81593e683955db458c96b6b5fb0fdf71b314ae /src/com/android/camera/VideoMenu.java | |
parent | 0b4b53688f8486537d9d58dc6448ca2db8c67c7d (diff) | |
download | android_packages_apps_Snap-4538ee80f8a9eb338281db00fb349e111eeb5aaf.tar.gz android_packages_apps_Snap-4538ee80f8a9eb338281db00fb349e111eeb5aaf.tar.bz2 android_packages_apps_Snap-4538ee80f8a9eb338281db00fb349e111eeb5aaf.zip |
snap: UX improvements v1
* Make the camera controls do sane things- get rid of the
manual placement of every widget and use layouts
* Animate everything correctly
* Show ripples when clicking the shutter
* Clean up a metric ton of dead code
* Moved more code into BaseUI
* Make setting up the camera controls less verbose and magical
* Fixed up panorama layout
Change-Id: Iaed44ca0201a2e2641e1c2460d3ff9ec3eae2d85
Diffstat (limited to 'src/com/android/camera/VideoMenu.java')
-rw-r--r-- | src/com/android/camera/VideoMenu.java | 59 |
1 files changed, 21 insertions, 38 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 6b06a1111..82d8c8afc 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -21,37 +21,33 @@ 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; -import android.util.Log; +import android.text.TextUtils; +import android.view.Display; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.view.ViewPropertyAnimator; -import android.widget.ListView; -import android.widget.TextView; -import android.widget.GridView; -import android.widget.ImageView; -import android.widget.LinearLayout; +import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.FrameLayout.LayoutParams; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.ListView; +import android.widget.TextView; +import android.widget.Toast; -import com.android.camera.ui.ListSubMenu; import com.android.camera.ui.ListMenu; -import com.android.camera.ui.TimeIntervalPopup; -import com.android.camera.ui.RotateImageView; -import com.android.camera.ui.RotateTextToast; -import org.codeaurora.snapcam.R; -import android.widget.HorizontalScrollView; -import android.widget.Toast; -import android.view.ViewGroup; -import android.view.WindowManager; -import android.view.Display; +import com.android.camera.ui.ListSubMenu; import com.android.camera.ui.RotateLayout; +import com.android.camera.ui.RotateTextToast; +import com.android.camera.ui.TimeIntervalPopup; import com.android.camera.util.CameraUtil; -import android.text.TextUtils; + +import org.codeaurora.snapcam.R; + import java.util.Locale; public class VideoMenu extends MenuController @@ -151,7 +147,6 @@ public class VideoMenu extends MenuController CameraSettings.KEY_VIDEO_TNR_MODE, CameraSettings.KEY_VIDEO_SNAPSHOT_SIZE }; - mFrontBackSwitcher.setVisibility(View.INVISIBLE); initSwitchItem(CameraSettings.KEY_CAMERA_ID, mFrontBackSwitcher); } @@ -474,8 +469,10 @@ public class VideoMenu extends MenuController public void initSwitchItem(final String prefKey, View switcher) { final IconListPreference pref = (IconListPreference) mPreferenceGroup.findPreference(prefKey); - if (pref == null) + if (pref == null) { + mUI.removeControlView(switcher); return; + } int[] iconIds = pref.getLargeIconIds(); int resid = -1; @@ -488,7 +485,6 @@ public class VideoMenu extends MenuController resid = pref.getSingleIcon(); } ((ImageView) switcher).setImageResource(resid); - switcher.setVisibility(View.VISIBLE); mPreferences.add(pref); mPreferenceMap.put(pref, switcher); switcher.setOnClickListener(new OnClickListener() { @@ -513,14 +509,14 @@ public class VideoMenu extends MenuController } public void initFilterModeButton(View button) { - button.setVisibility(View.INVISIBLE); final IconListPreference pref = (IconListPreference) mPreferenceGroup .findPreference(CameraSettings.KEY_VIDEOCAMERA_COLOR_EFFECT); - if (pref == null || pref.getValue() == null) + if (pref == null || pref.getValue() == null) { + mUI.removeControlView(button); return; + } changeFilterModeControlIcon(pref.getValue()); - button.setVisibility(View.VISIBLE); button.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -813,19 +809,6 @@ public class VideoMenu extends MenuController } } - public void hideUI() { - mFrontBackSwitcher.setVisibility(View.INVISIBLE); - mFilterModeSwitcher.setVisibility(View.INVISIBLE); - } - - public void showUI() { - mFrontBackSwitcher.setVisibility(View.VISIBLE); - final IconListPreference pref = (IconListPreference) mPreferenceGroup - .findPreference(CameraSettings.KEY_FILTER_MODE); - if (pref != null) { - mFilterModeSwitcher.setVisibility(View.VISIBLE); - } - } @Override // Hit when an item in the first-level popup gets selected, then bring up |