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

Commit a680a0c3 authored by Doris Liu's avatar Doris Liu
Browse files

Adding support for tiny planet in gallery 

Bug: 7344427
Change-Id: I6fad734b28022f45cc551d81212ee4d3a0c867b2
parent 79704855

res/drawable-hdpi/ic_menu_tiny_planet.png

0 → 100644
+2.37 KiB
Loading image diff...

res/drawable-mdpi/ic_menu_tiny_planet.png

0 → 100644
+1.45 KiB
Loading image diff...

res/drawable-xhdpi/ic_menu_tiny_planet.png

0 → 100644
+3.31 KiB
Loading image diff...

res/layout/photopage_bottom_controls.xml

+13 −0
Original line number Diff line number Diff line
@@ -34,4 +34,17 @@ 
                android:paddingLeft="5dp"

                android:paddingRight="5dp"

                android:visibility="gone"/>

        <ImageButton

                android:id="@+id/photopage_bottom_control_tiny_planet"

                android:src="@drawable/ic_menu_tiny_planet"

                android:background="@drawable/photopage_bottom_button_background"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentRight="true"

                android:layout_alignParentBottom="true"

                android:paddingTop="5dp"

                android:paddingBottom="5dp"

                android:paddingLeft="15dp"

                android:paddingRight="15dp"

                android:visibility="gone"/>

</RelativeLayout>

src/com/android/gallery3d/app/PhotoPage.java

+28 −4
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ public class PhotoPage extends ActivityState implements 
    private boolean mInCameraRoll;

    private boolean mRecenterCameraOnResume = true;



    // These are only valid after the panorama callback

    private boolean mIsPanorama;

    private boolean mIsPanorama360;



    private long mCameraSwitchCutoff = 0;

    private boolean mSkipUpdateCurrentPhoto = false;

    private static final long CAMERA_SWITCH_CUTOFF_THRESHOLD_MS = 300;
@@ -200,7 +204,8 @@ public class PhotoPage extends ActivityState implements 
        public void panoramaInfoAvailable(MediaObject mediaObject, boolean isPanorama,

                boolean isPanorama360) {

            if (mediaObject == mCurrentPhoto) {

                mHandler.obtainMessage(MSG_REFRESH_BOTTOM_CONTROLS, isPanorama ? 1 : 0, 0, mediaObject).sendToTarget();

                mHandler.obtainMessage(MSG_REFRESH_BOTTOM_CONTROLS, isPanorama ? 1 : 0, isPanorama360 ? 1 : 0,

                        mediaObject).sendToTarget();

            }

        }

    };
@@ -299,7 +304,9 @@ public class PhotoPage extends ActivityState implements 
                    }

                    case MSG_REFRESH_BOTTOM_CONTROLS: {

                        if (mCurrentPhoto == message.obj && mBottomControls != null) {

                            mBottomControls.refresh(message.arg1 != 0);

                            mIsPanorama = message.arg1 == 1;

                            mIsPanorama360 = message.arg2 == 1;

                            mBottomControls.refresh();

                        }

                        break;

                    }
@@ -584,7 +591,7 @@ public class PhotoPage extends ActivityState implements 
    }



    @Override

    public boolean canDisplayBottomControl(int control, boolean isPanorama) {

    public boolean canDisplayBottomControl(int control) {

        if (mCurrentPhoto == null) {

            return false;

        }
@@ -594,7 +601,10 @@ public class PhotoPage extends ActivityState implements 
                        && (mCurrentPhoto.getSupportedOperations() & MediaItem.SUPPORT_EDIT) != 0

                        && mCurrentPhoto.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE;

            case R.id.photopage_bottom_control_panorama:

                return isPanorama;

                return mIsPanorama;

            case R.id.photopage_bottom_control_tiny_planet:

                return mHaveImageEditor && mShowBars

                        && mIsPanorama360;

            default:

                return false;

        }
@@ -611,6 +621,9 @@ public class PhotoPage extends ActivityState implements 
                mActivity.getPanoramaViewHelper()

                        .showPanorama(mCurrentPhoto.getContentUri());

                return;

            case R.id.photopage_bottom_control_tiny_planet:

                launchTinyPlanet();

                return;

            default:

                return;

        }
@@ -651,6 +664,17 @@ public class PhotoPage extends ActivityState implements 
                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

    }



    private void launchTinyPlanet() {

        // Deep link into tiny planet

        MediaItem current = mModel.getMediaItem(0);

        Intent intent = new Intent(FilterShowActivity.TINY_PLANET_ACTION);

        intent.setClass(mActivity, FilterShowActivity.class);

        intent.setDataAndType(current.getContentUri(), current.getMimeType())

            .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

        mRecenterCameraOnResume = false;

        mActivity.startActivityForResult(intent, REQUEST_EDIT);

    }



    private void launchPhotoEditor() {

        MediaItem current = mModel.getMediaItem(0);

        if (current == null || (current.getSupportedOperations()