diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2015-09-20 02:31:09 +0300 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-20 20:02:05 +0300 |
commit | 71f4fae6ca8c12c467b5afa8a6d325fc10b77f45 (patch) | |
tree | c42a36b91e5236cffc1a6a35fddcb67a4c7d60f9 /src/com/android/camera/PhotoUI.java | |
parent | de3e756185977708f1fdd6eb7fe669173d3d8316 (diff) | |
download | android_packages_apps_Snap-71f4fae6ca8c12c467b5afa8a6d325fc10b77f45.tar.gz android_packages_apps_Snap-71f4fae6ca8c12c467b5afa8a6d325fc10b77f45.tar.bz2 android_packages_apps_Snap-71f4fae6ca8c12c467b5afa8a6d325fc10b77f45.zip |
Snap: Remove CAF beautification feature
Revert "SnapdragonCamera: Move the files to the correct location"
This reverts commit c25b2d510285512dbb60547353190433f1dbb984.
Revert "SnapdragonCamera: Add beautification feature to SnapdragonCamera."
This reverts commit c1cea7c15b2e463f37c17f2a4ce61ce689ec7088.
Change-Id: If01e4f438a58e4210a3eddf090d426895ecbae87
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 6e116f9a9..fdc0ec35a 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -56,7 +56,6 @@ import android.widget.Toast; import com.android.camera.CameraPreference.OnPreferenceChangedListener; import com.android.camera.FocusOverlayManager.FocusUI; -import com.android.camera.TsMakeupManager.MakeupLevelListener; import com.android.camera.ui.AbstractSettingPopup; import com.android.camera.ui.CameraControls; import com.android.camera.ui.CameraRootView; @@ -141,7 +140,6 @@ public class PhotoUI implements PieListener, private RotateLayout mMenuLayout; private RotateLayout mSubMenuLayout; private LinearLayout mPreviewMenuLayout; - private LinearLayout mMakeupMenuLayout; private boolean mUIhidden = false; private int mPreviewOrientation = -1; @@ -471,7 +469,7 @@ public class PhotoUI implements PieListener, } public void onCameraOpened(PreferenceGroup prefGroup, ComboPreferences prefs, - Camera.Parameters params, OnPreferenceChangedListener listener, MakeupLevelListener makeupListener) { + Camera.Parameters params, OnPreferenceChangedListener listener) { if (mPieRenderer == null) { mPieRenderer = new PieRenderer(mActivity); mPieRenderer.setPieListener(this); @@ -479,7 +477,7 @@ public class PhotoUI implements PieListener, } if (mMenu == null) { - mMenu = new PhotoMenu(mActivity, this, makeupListener); + mMenu = new PhotoMenu(mActivity, this); mMenu.setListener(listener); } mMenu.initialize(prefGroup); @@ -805,10 +803,6 @@ public class PhotoUI implements PieListener, return mPreviewMenuLayout; } - public void setMakeupMenuLayout(LinearLayout layout) { - mMakeupMenuLayout = layout; - } - public void showPopup(ListView popup, int level, boolean animate) { FrameLayout.LayoutParams params; hideUI(); @@ -1288,27 +1282,6 @@ public class PhotoUI implements PieListener, } } } - if(mMakeupMenuLayout != null) { - View view = mMakeupMenuLayout.getChildAt(0); - if(view instanceof RotateLayout) { - for(int i = mMakeupMenuLayout.getChildCount() -1; i >= 0; --i) { - RotateLayout l = (RotateLayout) mMakeupMenuLayout.getChildAt(i); - l.setOrientation(orientation, animation); - } - } else { - ViewGroup vg = (ViewGroup) mMakeupMenuLayout.getChildAt(1); - if(vg != null) { - for (int i = vg.getChildCount() - 1; i >= 0; --i) { - ViewGroup vewiGroup = (ViewGroup) vg.getChildAt(i); - if(vewiGroup instanceof RotateLayout) { - RotateLayout l = (RotateLayout) vewiGroup; - l.setOrientation(orientation, animation); - } - } - } - } - - } if (mCountDownView != null) mCountDownView.setOrientation(orientation); RotateTextToast.setOrientation(orientation); |