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

Commit d194b093 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 46106ca2: am 686fa2db: am c832ef0d: Merge "Show spinner while waiting for... 

am 46106ca2: am 686fa2db: am c832ef0d: Merge "Show spinner while waiting for mutations." into klp-dev

* commit '46106ca28e8a679ce2f0609d03ae6ba4b95d7f30':
  Show spinner while waiting for mutations.
parents afe0588a 48677888

res/layout/fragment_save.xml

+24 −8
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ 
            android:singleLine="true"

            android:selectAllOnFocus="true" />



        <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="match_parent">



            <Button

                android:id="@android:id/button1"

                android:layout_width="wrap_content"
@@ -61,6 +65,18 @@ 
                android:textAppearance="?android:attr/textAppearanceSmall"

                android:padding="8dp" />



            <ProgressBar

                android:id="@android:id/progress"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:visibility="gone"

                android:indeterminate="true"

                android:padding="8dp"

                style="?android:attr/progressBarStyle" />



        </FrameLayout>



    </LinearLayout>



</LinearLayout>

src/com/android/documentsui/CreateDirectoryFragment.java

+7 −0
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ public class CreateDirectoryFragment extends DialogFragment { 
            mDisplayName = displayName;

        }



        @Override

        protected void onPreExecute() {

            mActivity.setPending(true);

        }



        @Override

        protected DocumentInfo doInBackground(Void... params) {

            final ContentResolver resolver = mActivity.getContentResolver();
@@ -120,6 +125,8 @@ public class CreateDirectoryFragment extends DialogFragment { 
            } else {

                Toast.makeText(mActivity, R.string.create_error, Toast.LENGTH_SHORT).show();

            }



            mActivity.setPending(false);

        }

    }

}

src/com/android/documentsui/DocumentsActivity.java

+14 −0
Original line number Diff line number Diff line
@@ -661,6 +661,13 @@ public class DocumentsActivity extends Activity { 
        DirectoryFragment.get(getFragmentManager()).onUserModeChanged();

    }



    public void setPending(boolean pending) {

        final SaveFragment save = SaveFragment.get(getFragmentManager());

        if (save != null) {

            save.setPending(pending);

        }

    }



    @Override

    public void onBackPressed() {

        if (!mState.stackTouched) {
@@ -1050,6 +1057,11 @@ public class DocumentsActivity extends Activity { 
            mDisplayName = displayName;

        }



        @Override

        protected void onPreExecute() {

            setPending(true);

        }



        @Override

        protected Uri doInBackground(Void... params) {

            final ContentResolver resolver = getContentResolver();
@@ -1083,6 +1095,8 @@ public class DocumentsActivity extends Activity { 
                Toast.makeText(DocumentsActivity.this, R.string.save_error, Toast.LENGTH_SHORT)

                        .show();

            }



            setPending(false);

        }

    }

src/com/android/documentsui/SaveFragment.java

+9 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.ViewGroup; 
import android.widget.Button;

import android.widget.EditText;

import android.widget.ImageView;

import android.widget.ProgressBar;



import com.android.documentsui.model.DocumentInfo;
@@ -42,6 +43,7 @@ public class SaveFragment extends Fragment { 
    private DocumentInfo mReplaceTarget;

    private EditText mDisplayName;

    private Button mSave;

    private ProgressBar mProgress;

    private boolean mIgnoreNextEdit;



    private static final String EXTRA_MIME_TYPE = "mime_type";
@@ -83,6 +85,8 @@ public class SaveFragment extends Fragment { 
        mSave.setOnClickListener(mSaveListener);

        mSave.setEnabled(false);



        mProgress = (ProgressBar) view.findViewById(android.R.id.progress);



        return view;

    }
@@ -92,7 +96,6 @@ public class SaveFragment extends Fragment { 
            if (mIgnoreNextEdit) {

                mIgnoreNextEdit = false;

            } else {

                Log.d(TAG, "onTextChanged!");

                mReplaceTarget = null;

            }

        }
@@ -140,4 +143,9 @@ public class SaveFragment extends Fragment { 
    public void setSaveEnabled(boolean enabled) {

        mSave.setEnabled(enabled);

    }



    public void setPending(boolean pending) {

        mSave.setVisibility(pending ? View.INVISIBLE : View.VISIBLE);

        mProgress.setVisibility(pending ? View.VISIBLE : View.GONE);

    }

}