Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e1e5a5e authored by Michael Kolb's avatar Michael Kolb Committed by Android (Google) Code Review
Browse files

Merge "Don't add unsupported options to menu" into gb-ub-photos-bryce

parents 214f7869 265ea6fd

src/com/android/camera/PhotoMenu.java

+8 −4
Original line number Diff line number Diff line
@@ -69,8 +69,10 @@ public class PhotoMenu extends PieController 
            mRenderer.addItem(item);

        }

        // exposure compensation

        if (group.findPreference(CameraSettings.KEY_EXPOSURE) != null) {

            item = makeItem(CameraSettings.KEY_EXPOSURE, POS_EXP, 5);

            mRenderer.addItem(item);

        }

        // camera switcher

        if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) {

            item = makeItem(R.drawable.ic_switch_photo_facing_holo_light);
@@ -119,8 +121,10 @@ public class PhotoMenu extends PieController 
        more.setPosition(POS_MORE, 5);

        mRenderer.addItem(more);

        // white balance

        if (group.findPreference(CameraSettings.KEY_WHITE_BALANCE) != null) {

            item = makeItem(CameraSettings.KEY_WHITE_BALANCE, POS_WB, 5);

            more.addItem(item);

        }

        // settings popup

        mOtherKeys = new String[] {

                CameraSettings.KEY_SCENE_MODE,