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

Commit e97112e0 authored by Garfield Tan's avatar Garfield Tan
Browse files

Use NotificationChannels. DO NOT MERGE 

Add a feature flag to prepare for cherry picking to ARC++.

Test: Manual tests & auto tests.
Bug: 37564296
Change-Id: I2294bd156aa3d484529526b472c608458d828e5c
parent 85622acc

res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
    <bool name="feature_folders_in_search_results">true</bool>

    <bool name="feature_gesture_scale">true</bool>

    <bool name="feature_launch_to_document">true</bool>

    <bool name="feature_notification_channel">true</bool>

    <bool name="feature_remote_actions">true</bool>

    <bool name="feature_system_keyboard_navigation">true</bool>

    <bool name="feature_virtual_files_sharing">true</bool>

src/com/android/documentsui/base/Features.java

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public interface Features { 
    boolean isFoldersInSearchResultsEnabled();

    boolean isGestureScaleEnabled();

    boolean isLaunchToDocumentEnabled();

    boolean isNotificationChannelEnabled();

    boolean isRemoteActionsEnabled();

    boolean isSystemKeyboardNavigationEnabled();

    boolean isVirtualFilesSharingEnabled();
@@ -122,6 +123,11 @@ public interface Features { 
            return isEnabled(R.bool.feature_launch_to_document);

        }



        @Override

        public boolean isNotificationChannelEnabled() {

            return isEnabled(R.bool.feature_notification_channel);

        }



        @Override

        public boolean isRemoteActionsEnabled() {

            return isEnabled(R.bool.feature_remote_actions);

src/com/android/documentsui/services/CompressJob.java

+3 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.documentsui.R; 
import com.android.documentsui.archives.ArchivesProvider;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.DocumentStack;

import com.android.documentsui.base.Features;

import com.android.documentsui.clipping.UrisSupplier;



import java.io.FileNotFoundException;
@@ -55,8 +56,8 @@ final class CompressJob extends CopyJob { 
     * @see @link {@link Job} constructor for most param descriptions.

     */

    CompressJob(Context service, Listener listener,

            String id, DocumentStack destination, UrisSupplier srcs) {

        super(service, listener, id, OPERATION_MOVE, destination, srcs);

            String id, DocumentStack destination, UrisSupplier srcs, Features features) {

        super(service, listener, id, OPERATION_MOVE, destination, srcs, features);

    }



    @Override

src/com/android/documentsui/services/CopyJob.java

+6 −5
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import com.android.documentsui.Metrics; 
import com.android.documentsui.R;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.DocumentStack;

import com.android.documentsui.base.Features;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.clipping.UrisSupplier;

import com.android.documentsui.roots.ProvidersCache;
@@ -97,13 +98,13 @@ class CopyJob extends ResolvedResourcesJob { 
     * @see @link {@link Job} constructor for most param descriptions.

     */

    CopyJob(Context service, Listener listener, String id, DocumentStack destination,

            UrisSupplier srcs) {

        this(service, listener, id, OPERATION_COPY, destination, srcs);

            UrisSupplier srcs, Features features) {

        this(service, listener, id, OPERATION_COPY, destination, srcs, features);

    }



    CopyJob(Context service, Listener listener, String id, @OpType int opType,

            DocumentStack destination, UrisSupplier srcs) {

        super(service, listener, id, opType, destination, srcs);

            DocumentStack destination, UrisSupplier srcs, Features features) {

        super(service, listener, id, opType, destination, srcs, features);

        mDstInfo = destination.peek();



        assert(srcs.getItemCount() > 0);
@@ -201,7 +202,7 @@ class CopyJob extends ResolvedResourcesJob { 


        // TODO: Consider adding a dialog on tapping the notification with a list of

        // converted files.

        final Notification.Builder warningBuilder = new Notification.Builder(service)

        final Notification.Builder warningBuilder = createNotificationBuilder()

                .setContentTitle(service.getResources().getString(

                        R.string.notification_copy_files_converted_title))

                .setContentText(service.getString(

src/com/android/documentsui/services/DeleteJob.java

+3 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.documentsui.Metrics; 
import com.android.documentsui.R;

import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.DocumentStack;

import com.android.documentsui.base.Features;

import com.android.documentsui.clipping.UrisSupplier;



import java.io.FileNotFoundException;
@@ -51,8 +52,8 @@ final class DeleteJob extends ResolvedResourcesJob { 
     * @see @link {@link Job} constructor for most param descriptions.

     */

    DeleteJob(Context service, Listener listener, String id, DocumentStack stack,

            UrisSupplier srcs, @Nullable Uri srcParent) {

        super(service, listener, id, OPERATION_DELETE, stack, srcs);

            UrisSupplier srcs, @Nullable Uri srcParent, Features features) {

        super(service, listener, id, OPERATION_DELETE, stack, srcs, features);

        mParentUri = srcParent;

    }