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

Commit 50a1674e authored by ztenghui's avatar ztenghui Committed by Android (Google) Code Review
Browse files

Merge "Check whether save button should be enabled when time bar updates" into... 

Merge "Check whether save button should be enabled when time bar updates" into gb-ub-photos-carlsbad
parents f29cc45a 70df03be

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -197,6 +197,8 @@ public class TrimVideo extends Activity implements 
            mTrimEndTime = duration;

            mTrimEndTime = duration;

        }

        }

        mController.setTimes(mVideoPosition, duration, mTrimStartTime, mTrimEndTime);

        mController.setTimes(mVideoPosition, duration, mTrimStartTime, mTrimEndTime);

        // Enable save if there's modifications

        mSaveVideoTextView.setEnabled(isModified());

        return mVideoPosition;

        return mVideoPosition;

    }

    }
@@ -307,8 +309,6 @@ public class TrimVideo extends Activity implements 
        mTrimStartTime = start;

        mTrimStartTime = start;

        mTrimEndTime = end;

        mTrimEndTime = end;

        setProgress();

        setProgress();

        // Enable save if there's modifications

        mSaveVideoTextView.setEnabled(isModified());

    }

    }





    @Override

    @Override