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

Commit 1050bc54 authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "Move shortcuts updater to common package." into arc-apps 

am: b40c6634

Change-Id: Id16d6a841107dbd9c889563dcee10307c71ffe3a
parents c002c142 b40c6634

src/com/android/documentsui/files/ShortcutsUpdater.java→src/com/android/documentsui/ShortcutsUpdater.java

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.documentsui.files;

package com.android.documentsui;



import android.annotation.DrawableRes;

import android.content.Context;
@@ -25,6 +25,7 @@ import android.graphics.drawable.Icon; 
import com.android.documentsui.R;

import com.android.documentsui.base.Providers;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.prefs.ScopedPreferences;



import java.util.ArrayList;

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.documentsui.OperationDialogFragment.DialogType; 
import com.android.documentsui.ProviderExecutor;

import com.android.documentsui.R;

import com.android.documentsui.SharedInputHandler;

import com.android.documentsui.ShortcutsUpdater;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.Features;

import com.android.documentsui.base.RootInfo;

src/com/android/documentsui/picker/PickActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import com.android.documentsui.base.RootInfo; 
import com.android.documentsui.base.Shared;

import com.android.documentsui.base.State;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.files.ShortcutsUpdater;

import com.android.documentsui.prefs.ScopedPreferences;

import com.android.documentsui.selection.SelectionManager;

import com.android.documentsui.services.FileOperationService;
@@ -56,6 +55,7 @@ import com.android.documentsui.sidebar.RootsFragment; 
import com.android.documentsui.ui.DialogController;

import com.android.documentsui.ui.MessageBuilder;



import java.util.Collection;

import java.util.List;



public class PickActivity extends BaseActivity implements ActionHandler.Addons {
@@ -86,7 +86,7 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons { 
                new MessageBuilder(this),

                DialogController.create(features, this, null),

                DocumentsApplication.getFileTypeLookup(this),

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

                (Collection<RootInfo> roots) -> {});



        super.onCreate(icicle);