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

Commit 55ede5ec authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove useless code" into rvc-dev am: 4505a178 am: 4a8248a6 am:... 

Merge "Remove useless code" into rvc-dev am: 4505a178 am: 4a8248a6 am: 8f584a93 am: cf2cd3eb

Change-Id: I605e3408a1d6b8219ad26a5a3f5e72a7d4a30ec8
parents d36de43f cf2cd3eb

src/com/android/documentsui/BaseActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ import com.android.documentsui.dirlist.AnimationView; 
import com.android.documentsui.dirlist.AppsRowManager;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.prefs.LocalPreferences;

import com.android.documentsui.prefs.Preferences;

import com.android.documentsui.prefs.PreferencesMonitor;

import com.android.documentsui.queries.CommandInterceptor;

import com.android.documentsui.queries.SearchChipData;
@@ -250,7 +249,7 @@ public abstract class BaseActivity 


        ViewGroup chipGroup = findViewById(R.id.search_chip_group);

        mSearchManager = new SearchViewManager(searchListener, queryInterceptor,

                chipGroup, icicle, mInjector.prefs::isRecordSearch);

                chipGroup, icicle);

        // initialize the chip sets by accept mime types

        mSearchManager.initChipSets(mState.acceptMimes);

        // update the chip items by the mime types of the root
@@ -293,7 +292,7 @@ public abstract class BaseActivity 
        // For now, we only work with prefs that we backup. This

        // just limits the scope of what we expect to come flowing

        // through here until we know we want more and fancier options.

        assert(Preferences.shouldBackup(pref));

        assert (LocalPreferences.shouldBackup(pref));

    }



    @Override

src/com/android/documentsui/DocumentsApplication.java

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.documentsui.base.UserId; 
import com.android.documentsui.clipping.ClipStorage;

import com.android.documentsui.clipping.ClipStore;

import com.android.documentsui.clipping.DocumentClipper;

import com.android.documentsui.prefs.ScopedAccessLocalPreferences;

import com.android.documentsui.queries.SearchHistoryManager;

import com.android.documentsui.roots.ProvidersCache;

import com.android.documentsui.theme.ThemeOverlayManager;
@@ -138,7 +137,6 @@ public class DocumentsApplication extends Application { 
        final IntentFilter localeFilter = new IntentFilter();

        localeFilter.addAction(Intent.ACTION_LOCALE_CHANGED);

        registerReceiver(mCacheReceiver, localeFilter);

        ScopedAccessLocalPreferences.clearScopedAccessPreferences(this);



        SearchHistoryManager.getInstance(getApplicationContext());

    }

src/com/android/documentsui/Injector.java

+1 −6
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.documentsui.base.Lookup; 
import com.android.documentsui.base.RootInfo;

import com.android.documentsui.dirlist.AppsRowManager;

import com.android.documentsui.picker.PickResult;

import com.android.documentsui.prefs.ScopedPreferences;

import com.android.documentsui.queries.SearchViewManager;

import com.android.documentsui.ui.DialogController;

import com.android.documentsui.ui.MessageBuilder;
@@ -50,7 +49,6 @@ public class Injector<T extends ActionHandler> { 


    public final Features features;

    public final ActivityConfig config;

    public final ScopedPreferences prefs;

    public final MessageBuilder messages;

    public final Lookup<String, String> fileTypeLookup;

    public final Consumer<Collection<RootInfo>> shortcutsUpdater;
@@ -86,12 +84,11 @@ public class Injector<T extends ActionHandler> { 
    public Injector(

            Features features,

            ActivityConfig config,

            ScopedPreferences prefs,

            MessageBuilder messages,

            DialogController dialogs,

            Lookup<String, String> fileTypeLookup,

            Consumer<Collection<RootInfo>> shortcutsUpdater) {

        this(features, config, prefs, messages, dialogs, fileTypeLookup,

        this(features, config, messages, dialogs, fileTypeLookup,

                shortcutsUpdater, new Model(features));

    }
@@ -99,7 +96,6 @@ public class Injector<T extends ActionHandler> { 
    public Injector(

            Features features,

            ActivityConfig config,

            ScopedPreferences prefs,

            MessageBuilder messages,

            DialogController dialogs,

            Lookup<String, String> fileTypeLookup,
@@ -108,7 +104,6 @@ public class Injector<T extends ActionHandler> { 


        this.features = features;

        this.config = config;

        this.prefs = prefs;

        this.messages = messages;

        this.dialogs = dialogs;

        this.fileTypeLookup = fileTypeLookup;

src/com/android/documentsui/ShortcutsUpdater.java

+1 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.documentsui.base.Providers; 
import com.android.documentsui.base.RootInfo;

import com.android.documentsui.base.Shared;

import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.prefs.ScopedPreferences;



import java.util.ArrayList;

import java.util.Collection;
@@ -40,12 +39,10 @@ import java.util.Map; 
 */

public final class ShortcutsUpdater {



    private final ScopedPreferences mPrefs;

    private final Context mContext;



    public ShortcutsUpdater(Context context, ScopedPreferences prefs) {

    public ShortcutsUpdater(Context context) {

        mContext = context;

        mPrefs = prefs;

    }



    public void update(Collection<RootInfo> roots) {

src/com/android/documentsui/files/FilesActivity.java

+1 −4
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import com.android.documentsui.clipping.DocumentClipper; 
import com.android.documentsui.dirlist.AnimationView.AnimationType;

import com.android.documentsui.dirlist.AppsRowManager;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.prefs.ScopedPreferences;

import com.android.documentsui.services.FileOperationService;

import com.android.documentsui.sidebar.RootsFragment;

import com.android.documentsui.ui.DialogController;
@@ -92,16 +91,14 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler 


        MessageBuilder messages = new MessageBuilder(this);

        Features features = Features.create(this);

        ScopedPreferences prefs = ScopedPreferences.create(this, PREFERENCES_SCOPE);



        mInjector = new Injector<>(

                features,

                new Config(),

                ScopedPreferences.create(this, PREFERENCES_SCOPE),

                messages,

                DialogController.create(features, this),

                DocumentsApplication.getFileTypeLookup(this),

                new ShortcutsUpdater(this, prefs)::update);

                new ShortcutsUpdater(this)::update);



        super.onCreate(icicle);