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

Commit e51f236b authored by Bobby Georgescu's avatar Bobby Georgescu Committed by Android (Google) Code Review
Browse files

Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

parents 2634fe5f 0683fe0a

res/layout/ingest_fullsize.xml

+9 −2
Original line number Diff line number Diff line
@@ -17,12 +17,19 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent" >



    <ProgressBar

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerHorizontal="true"

        android:layout_centerVertical="true"

        android:progress="1"

        android:indeterminate="true"

        android:indeterminateOnly="true" />



    <com.android.gallery3d.ingest.ui.MtpImageView

        android:id="@+id/ingest_fullsize_image"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:layout_centerHorizontal="true"

        android:layout_centerVertical="true"

        android:scaleType="matrix" />



    <CheckBox

src/com/android/gallery3d/ingest/ui/MtpImageView.java

+3 −0
Original line number Diff line number Diff line
@@ -152,7 +152,9 @@ public class MtpImageView extends ImageView { 
        } else {

            setRotation(bitmapWithMetadata.rotationDegrees);

        }

        setAlpha(0f);

        setImageBitmap(bitmapWithMetadata.bitmap);

        animate().alpha(1f);

    }



    protected void cancelLoadingAndClear() {
@@ -161,6 +163,7 @@ public class MtpImageView extends ImageView { 
            mFetchObjectInfo = null;

            mFetchResult = null;

        }

        animate().cancel();

        setImageResource(android.R.color.transparent);

    }