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

Commit b6006b2e authored by Steve McKay's avatar Steve McKay
Browse files

manager/ManageActivity back to files/FilesActivity. 

The "mange" rename resulted in a disturbance in the force.

Change-Id: I0f057ba7621912f173e47a472bfc6e23a5a6d54a
parent d79f38f8

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
        </activity>



        <activity

            android:name=".manager.LauncherActivity"

            android:name=".files.LauncherActivity"

            android:label="@string/downloads_label"

            android:icon="@drawable/files_icon"

            android:theme="@android:style/Theme.NoDisplay">
@@ -52,7 +52,7 @@ 
        <!--  Preserve original launcher activity from Nougat. -->

        <activity-alias

            android:name=".Launcher"

            android:targetActivity=".manager.LauncherActivity"

            android:targetActivity=".files.LauncherActivity"

            android:label="@string/downloads_label"

            android:icon="@drawable/files_icon" >

            <intent-filter>
@@ -62,7 +62,7 @@ 
        </activity-alias>



        <activity

            android:name=".manager.ManageActivity"

            android:name=".files.FilesActivity"

            android:label="@string/downloads_label"

            android:icon="@drawable/files_icon"

            android:documentLaunchMode="intoExisting"

perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java

+3 −3
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import android.test.suitebuilder.annotation.LargeTest; 


import com.android.documentsui.BaseActivity.EventListener;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.ActivityTest;

import com.android.documentsui.manager.ManageActivity;



import java.util.ArrayList;

import java.util.Arrays;
@@ -37,7 +37,7 @@ import java.util.List; 
import java.util.concurrent.CountDownLatch;



@LargeTest

public class FilesActivityPerfTest extends ActivityTest<ManageActivity> {

public class FilesActivityPerfTest extends ActivityTest<FilesActivity> {



    // Constants starting with KEY_ are used to report metrics to APCT.

    private static final String KEY_FILES_LISTED_PERFORMANCE_FIRST =
@@ -52,7 +52,7 @@ public class FilesActivityPerfTest extends ActivityTest<ManageActivity> { 
    private static final int NUM_MEASUREMENTS = 10;



    public FilesActivityPerfTest() {

        super(ManageActivity.class);

        super(FilesActivity.class);

    }



    @Override

perf-tests/src/com/android/documentsui/FilesJankPerfTest.java

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import android.support.test.uiautomator.UiScrollable; 
import android.util.Log;



import com.android.documentsui.bots.SidebarBot;

import com.android.documentsui.manager.ManageActivity;

import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.bots.DirectoryListBot;



@LargeTest
@@ -55,7 +55,7 @@ public class FilesJankPerfTest extends JankTestBase { 
        mRootsListBot = new SidebarBot(device, context, BOT_TIMEOUT);

        mDirListBot = new DirectoryListBot(device, automation, context, BOT_TIMEOUT);



        final Intent intent = new Intent(context, ManageActivity.class);

        final Intent intent = new Intent(context, FilesActivity.class);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        mActivity = getInstrumentation().startActivitySync(intent);

        try {

src/com/android/documentsui/AbstractActionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.documentsui.dirlist.AnimationView.AnimationType; 
import com.android.documentsui.dirlist.DocumentDetails;

import com.android.documentsui.dirlist.Model;

import com.android.documentsui.dirlist.MultiSelectManager.Selection;

import com.android.documentsui.manager.LauncherActivity;

import com.android.documentsui.files.LauncherActivity;

import com.android.documentsui.roots.LoadRootTask;

import com.android.documentsui.roots.RootsAccess;

import com.android.documentsui.sidebar.EjectRootTask;

src/com/android/documentsui/Metrics.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.documentsui.base.DocumentInfo; 
import com.android.documentsui.base.RootInfo;

import com.android.documentsui.base.State;

import com.android.documentsui.base.State.ActionType;

import com.android.documentsui.manager.LauncherActivity;

import com.android.documentsui.files.LauncherActivity;

import com.android.documentsui.services.FileOperationService;

import com.android.documentsui.services.FileOperationService.OpType;

import com.android.internal.logging.MetricsLogger;