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

Commit 6a7758a3 authored by Tobias Thierer's avatar Tobias Thierer Committed by Android (Google) Code Review
Browse files

Merge "Expose a BaseActivity methods to work around compiler/desugar bug."

parents 26dc1421 e3830da9

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

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ public class FilesActivity extends BaseActivity implements ActionHandler.Addons 
        super(R.layout.files_activity, TAG);

    }



    // make these methods visible in this package to work around compiler bug http://b/62218600

    @Override protected boolean focusSidebar() { return super.focusSidebar(); }

    @Override protected boolean popDir() { return super.popDir(); }



    @Override

    public void onCreate(Bundle icicle) {

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

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons { 
        super(R.layout.documents_activity, TAG);

    }



    // make these methods visible in this package to work around compiler bug http://b/62218600

    @Override protected boolean focusSidebar() { return super.focusSidebar(); }

    @Override protected boolean popDir() { return super.popDir(); }



    @Override

    public void onCreate(Bundle icicle) {