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

Commit e6d02b6c authored by Daniel Nishi's avatar Daniel Nishi Committed by Android (Google) Code Review
Browse files

Merge "Update the deletion helper feature factory for photos and videos." into nyc-mr1-dev

parents 07724711 76cd0118

src/com/android/settings/PhotosDeletionPreference.java

+2 −3
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ import android.text.format.Formatter; 
 * Preference to handle the deletion of photos and videos in the Deletion Helper.

 */

public class PhotosDeletionPreference extends DeletionPreference {

    // TODO(b/28560570): Remove this dummy value.

    private static final int FAKE_DAYS_TO_KEEP = 30;

    public static final int DAYS_TO_KEEP = 30;



    public PhotosDeletionPreference(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -42,7 +41,7 @@ public class PhotosDeletionPreference extends DeletionPreference { 
        Context context = getContext();

        setTitle(context.getString(R.string.deletion_helper_photos_title, items));

        setSummary(context.getString(R.string.deletion_helper_photos_summary,

                Formatter.formatFileSize(context, bytes), FAKE_DAYS_TO_KEEP));

                Formatter.formatFileSize(context, bytes), DAYS_TO_KEEP));

    }



    @Override

src/com/android/settings/deletionhelper/DeletionHelperFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement 
        mProvider =

                FeatureFactory.getFactory(app).getDeletionHelperFeatureProvider();

        if (mProvider != null) {

            mPhotoVideoDeletion = mProvider.createPhotoVideoDeletionType();

            mPhotoVideoDeletion = mProvider.createPhotoVideoDeletionType(getContext());

        }

        mDownloadsDeletion = new DownloadsDeletionType(getActivity());

src/com/android/settings/overlay/DeletionHelperFeatureProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.overlay;



import android.content.Context;

import android.support.v7.preference.PreferenceGroup;

import com.android.settings.deletionhelper.DeletionType;
@@ -26,5 +27,5 @@ public interface DeletionHelperFeatureProvider { 
    /**

     * Creates a {@link DeletionType} for clearing out stored photos and videos on the device.

     */

    DeletionType createPhotoVideoDeletionType();

    DeletionType createPhotoVideoDeletionType(Context context);

}