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

Commit 4ce11e2d authored by Tony Huang's avatar Tony Huang
Browse files

Fix crash on easter egg debug mode 

Because we use Androidx Toolbar so Activity.getActionBar will get null.
It should use getSupportActionBar but this function only implement on
AppCompatActivity and this need more change.
Remove the set color call to prevent crash first and update the status
bar color to suitable one.

Fix: 141465269
Test: manual
Test: atest DocumentsUIGoogleTests
Change-Id: Ib23e0e46fec29b1079e053921bbd88e84ac8fdb2
parent 679e5c0d

src/com/android/documentsui/AbstractActionHandler.java

+1 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.content.Intent; 
import android.content.IntentSender;

import android.content.pm.ResolveInfo;

import android.database.Cursor;

import android.graphics.drawable.ColorDrawable;

import android.net.Uri;

import android.os.Bundle;

import android.os.Parcelable;
@@ -436,10 +435,8 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA 
        if (enabled) {

            showDebugMessage();

        } else {

            mActivity.getActionBar().setBackgroundDrawable(new ColorDrawable(

                    mActivity.getResources().getColor(R.color.primary)));

            mActivity.getWindow().setStatusBarColor(

                    mActivity.getResources().getColor(android.R.color.background_dark));

                    mActivity.getResources().getColor(R.color.app_background_color));

        }

    }
@@ -452,7 +449,6 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA 


        Snackbars.showCustomTextWithImage(mActivity, messagePair.first, messagePair.second);



        mActivity.getActionBar().setBackgroundDrawable(new ColorDrawable(colors[0]));

        mActivity.getWindow().setStatusBarColor(colors[1]);

    }