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

Commit 73a132ad authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Show share button in downloads."

parents abe0e508 02794193

packages/DocumentsUI/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ 
        </activity>

        </activity>





        <activity

        <activity

            android:name=".ManageRootActivity"

            android:name=".DownloadsActivity"

            android:theme="@style/DocumentsFullScreenTheme"

            android:theme="@style/DocumentsFullScreenTheme"

            android:icon="@drawable/ic_doc_text">

            android:icon="@drawable/ic_doc_text">

            <intent-filter>

            <intent-filter>

packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java→packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java

+8 −5
Original line number Original line Diff line number Diff line
@@ -50,8 +50,11 @@ import com.android.internal.util.Preconditions; 
import java.util.Arrays;

import java.util.Arrays;

import java.util.List;

import java.util.List;





public class ManageRootActivity extends BaseActivity {

// Let's face it. MANAGE_ROOT is used almost exclusively

    private static final String TAG = "ManageRootsActivity";

// for downloads, and is specialized for this purpose.

// So it is now thusly christened.

public class DownloadsActivity extends BaseActivity {

    private static final String TAG = "DownloadsActivity";





    private Toolbar mToolbar;

    private Toolbar mToolbar;

    private Spinner mToolbarStack;

    private Spinner mToolbarStack;
@@ -59,7 +62,7 @@ public class ManageRootActivity extends BaseActivity { 
    private ItemSelectedListener mStackListener;

    private ItemSelectedListener mStackListener;

    private BaseAdapter mStackAdapter;

    private BaseAdapter mStackAdapter;





    public ManageRootActivity() {

    public DownloadsActivity() {

        super(R.layout.manage_roots_activity, TAG);

        super(R.layout.manage_roots_activity, TAG);

    }

    }
@@ -250,7 +253,7 @@ public class ManageRootActivity extends BaseActivity { 
        finish();

        finish();

    }

    }





    public static ManageRootActivity get(Fragment fragment) {

    public static DownloadsActivity get(Fragment fragment) {

        return (ManageRootActivity) fragment.getActivity();

        return (DownloadsActivity) fragment.getActivity();

    }

    }

}
 
}

packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -176,7 +176,6 @@ public abstract class FragmentTuner { 
            final MenuItem moveTo = menu.findItem(R.id.menu_move_to);

            final MenuItem moveTo = menu.findItem(R.id.menu_move_to);





            open.setVisible(false);

            open.setVisible(false);

            share.setVisible(false);

            delete.setVisible(canDelete);

            delete.setVisible(canDelete);

            copyTo.setVisible(true);

            copyTo.setVisible(true);

            copyTo.setEnabled(true);

            copyTo.setEnabled(true);