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

Commit dc236d5f authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Code reformatting for upcoming automated code changes." am: 661facc2 

am: aca9678a

Change-Id: I153eca69dcddd809f11ebc398380a5dca9408041
parents d0f367e7 aca9678a

core/java/android/widget/MediaController.java

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ public class MediaController extends FrameLayout { 
    private View mDecor;

    private WindowManager.LayoutParams mDecorLayoutParams;

    private ProgressBar mProgress;

    private TextView mEndTime, mCurrentTime;

    private TextView mEndTime;

    private TextView mCurrentTime;

    private boolean mShowing;

    private boolean mDragging;

    private static final int sDefaultTimeout = 3000;