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

Commit 7616b00b authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'mig' into mnc-dev 

* changes:
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.
parents e21573da 48751c1a

res/layout/preference_storage_action.xml

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
        android:layout_gravity="center"

        android:gravity="center"

        android:src="@drawable/ic_eject_24dp"

        android:tint="?android:attr/textColorSecondary"

        android:background="?android:attr/selectableItemBackground" />



</LinearLayout>

res/layout/storage_summary.xml

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
        android:layout_height="wrap_content"

        android:textAlignment="viewStart"

        android:textAppearance="@android:style/TextAppearance.Material.Body1"

        android:textColor="?android:attr/textColorSecondaryNoDisable"

        android:maxLines="10" />



    <ProgressBar

src/com/android/settings/deviceinfo/MigrateEstimateTask.java

+5 −0
Original line number Diff line number Diff line
@@ -81,6 +81,11 @@ public abstract class MigrateEstimateTask extends AsyncTask<Void, Void, Long> im 
        final VolumeInfo privateVol = mContext.getPackageManager().getPrimaryStorageCurrentVolume();

        final VolumeInfo emulatedVol = mStorage.findEmulatedForPrivate(privateVol);



        if (emulatedVol == null) {

            Log.w(TAG, "Failed to find current primary storage");

            return -1L;

        }



        final String path = emulatedVol.getPath().getAbsolutePath();

        Log.d(TAG, "Estimating for current path " + path);

src/com/android/settings/deviceinfo/PrivateVolumeSettings.java

+18 −17
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 


    private UserInfo mCurrentUser;



    private int mNextOrder = 0;



    private StorageSummaryPreference mSummary;

    private StorageItemPreference mApps;

    private StorageItemPreference mImages;
@@ -140,6 +138,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 
        }



        addPreferencesFromResource(R.xml.device_info_storage_volume);

        getPreferenceScreen().setOrderingAsAdded(true);



        // Find the emulated shared storage layered above this private volume

        mSharedVolume = mStorageManager.findEmulatedForPrivate(mVolume);
@@ -183,29 +182,29 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 


        screen.removeAll();



        screen.addPreference(mSummary);

        addPreference(mSummary);



        final boolean showUsers = !mUsers.isEmpty();

        final boolean showShared = (mSharedVolume != null) && mSharedVolume.isMountedReadable();



        if (showUsers) {

            screen.addPreference(new PreferenceHeader(context, mCurrentUser.name));

            addPreference(new PreferenceHeader(context, mCurrentUser.name));

        }

        screen.addPreference(mApps);

        addPreference(mApps);

        if (showShared) {

            screen.addPreference(mImages);

            screen.addPreference(mVideos);

            screen.addPreference(mAudio);

            screen.addPreference(mOther);

            addPreference(mImages);

            addPreference(mVideos);

            addPreference(mAudio);

            addPreference(mOther);

        }

        screen.addPreference(mCache);

        addPreference(mCache);

        if (showShared) {

            screen.addPreference(mExplore);

            addPreference(mExplore);

        }

        if (showUsers) {

            screen.addPreference(new PreferenceHeader(context, R.string.storage_other_users));

            addPreference(new PreferenceHeader(context, R.string.storage_other_users));

            for (Preference pref : mUsers) {

                screen.addPreference(pref);

                addPreference(pref);

            }

        }
@@ -231,16 +230,18 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 
        mMeasure.forceMeasure();

    }



    private void addPreference(Preference pref) {

        pref.setOrder(Preference.DEFAULT_ORDER);

        getPreferenceScreen().addPreference(pref);

    }



    private StorageItemPreference buildItem(int titleRes) {

        final StorageItemPreference pref = new StorageItemPreference(getActivity(), titleRes);

        pref.setOrder(mNextOrder++);

        return pref;

        return new StorageItemPreference(getActivity(), titleRes);

    }



    private Preference buildAction(int titleRes) {

        final Preference pref = new Preference(getActivity());

        pref.setTitle(titleRes);

        pref.setOrder(mNextOrder++);

        return pref;

    }

src/com/android/settings/deviceinfo/PublicVolumeSettings.java

+11 −8
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment { 
    private VolumeInfo mVolume;

    private DiskInfo mDisk;



    private int mNextOrder = 0;



    private StorageSummaryPreference mSummary;



    private Preference mMount;
@@ -108,6 +106,7 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment { 
        mVolumeId = mVolume.getId();



        addPreferencesFromResource(R.xml.device_info_storage_volume);

        getPreferenceScreen().setOrderingAsAdded(true);



        mSummary = new StorageSummaryPreference(context);
@@ -133,7 +132,7 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment { 
        screen.removeAll();



        if (mVolume.isMountedReadable()) {

            screen.addPreference(mSummary);

            addPreference(mSummary);



            final File file = mVolume.getPath();

            final long totalBytes = file.getTotalSpace();
@@ -149,21 +148,25 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment { 
        }



        if (mVolume.getState() == VolumeInfo.STATE_UNMOUNTED) {

            screen.addPreference(mMount);

            addPreference(mMount);

        }

        if (mVolume.isMountedReadable()) {

            screen.addPreference(mUnmount);

            addPreference(mUnmount);

        }

        screen.addPreference(mFormatPublic);

        addPreference(mFormatPublic);

        if (mDisk.isAdoptable() && mIsPermittedToAdopt) {

            screen.addPreference(mFormatPrivate);

            addPreference(mFormatPrivate);

        }

    }



    private void addPreference(Preference pref) {

        pref.setOrder(Preference.DEFAULT_ORDER);

        getPreferenceScreen().addPreference(pref);

    }



    private Preference buildAction(int titleRes) {

        final Preference pref = new Preference(getActivity());

        pref.setTitle(titleRes);

        pref.setOrder(mNextOrder++);

        return pref;

    }