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

Commit 5b991f5c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make some Job methods public" into main

parents 778ca0e8 80061f71

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ final class CompressJob extends CopyJob { 
    }



    @Override

    Notification getFailureNotification() {

    public Notification getFailureNotification() {

        return getFailureNotification(

                getRes(R.plurals.compress_error_notification_title),

                getRes(R.drawable.ic_menu_compress));

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

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ class CopyJob extends ResolvedResourcesJob { 
    }



    @Override

    Notification getFailureNotification() {

    public Notification getFailureNotification() {

        return getFailureNotification(

                getRes(R.plurals.copy_error_notification_title), getRes(R.drawable.ic_menu_copy));

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ final class DeleteJob extends ResolvedResourcesJob { 
    }



    @Override

    Notification getFailureNotification() {

    public Notification getFailureNotification() {

        return getFailureNotification(

                getRes(R.plurals.delete_error_notification_title),

                getRes(R.drawable.ic_menu_delete));

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

+5 −4
Original line number Diff line number Diff line
@@ -185,9 +185,10 @@ abstract public class Job implements Runnable { 
    abstract void finish();



    abstract void start();

    abstract Notification getSetupNotification();

    abstract Notification getProgressNotification();

    abstract Notification getFailureNotification();



    public abstract Notification getSetupNotification();

    public abstract Notification getProgressNotification();

    public abstract Notification getFailureNotification();



    /** Must be implemented if hasWarnings() can return true. */

    Notification getWarningNotification() {
@@ -402,7 +403,7 @@ abstract public class Job implements Runnable { 
    /**

     * Listener interface employed by the service that owns us as well as tests.

     */

    interface Listener {

    public interface Listener {

        void onStart(Job job);

        void onFinished(Job job);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ final class MoveJob extends CopyJob { 
    }



    @Override

    Notification getFailureNotification() {

    public Notification getFailureNotification() {

        return getFailureNotification(

                getRes(R.plurals.move_error_notification_title), getRes(R.drawable.ic_menu_copy));

    }