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

Commit efbcc69c authored by Mill Chen's avatar Mill Chen
Browse files

Fix inconsist color filling on collapsing toolbar 

Some pages are updating the background color for action bar after action
bar is created, which will break the animation of collapsing toolbar. It
also causes the different color filled in the status bar and collapsing
toolbar area separately. Removing the styleActionbar method from
EntityHeaderController can fix this issue.

Fix: 187019164
Test: robotests && visual verified
1) Settings -> Apps -> See all apps -> pick up either app -> Mobile data
& Wi-Fi
2) Scrolling the content and see if the toolbar has the different color
between status bar and toolbar

Change-Id: Ic0842b9e6c48662872694534a3696c4b8900481f
parent d7caf655

src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java

+2 −9
Original line number Diff line number Diff line
@@ -29,11 +29,10 @@ import com.android.settingslib.applications.AppUtils; 
import com.android.settingslib.applications.ApplicationsState.AppEntry;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.widget.LayoutPreference;



public class AppHeaderViewPreferenceController extends BasePreferenceController

        implements AppInfoDashboardFragment.Callback, LifecycleObserver, OnStart {

        implements AppInfoDashboardFragment.Callback, LifecycleObserver {



    private static final String KEY_HEADER = "header_view";
@@ -67,19 +66,13 @@ public class AppHeaderViewPreferenceController extends BasePreferenceController 
        final Activity activity = mParent.getActivity();

        mEntityHeaderController = EntityHeaderController

                .newInstance(activity, mParent, mHeader.findViewById(R.id.entity_header))

                .setRecyclerView(mParent.getListView(), mLifecycle)

                .setPackageName(mPackageName)

                .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,

                        EntityHeaderController.ActionType.ACTION_NONE)

                .bindHeaderButtons();

    }



    @Override

    public void onStart() {

        mEntityHeaderController

                .setRecyclerView(mParent.getListView(), mLifecycle)

                .styleActionBar(mParent.getActivity());

    }



    @Override

    public void refreshUi() {

        setAppLabelAndIcon(mParent.getPackageInfo(), mParent.getAppEntry());

src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java

+0 −9
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.util.IconDrawableFactory; 
import android.view.View;



import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;
@@ -36,7 +35,6 @@ import com.android.settings.notification.NotificationBackend; 
import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.applications.AppUtils;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.widget.LayoutPreference;



public class HeaderPreferenceController extends BasePreferenceController
@@ -127,11 +125,4 @@ public class HeaderPreferenceController extends BasePreferenceController 
                .done(mFragment.getActivity(), mContext);

        pref.findViewById(R.id.entity_header).setVisibility(View.VISIBLE);

    }



    @OnLifecycleEvent(Lifecycle.Event.ON_START)

    public void onStart() {

        if (mHeaderController != null) {

            mHeaderController.styleActionBar(mFragment.getActivity());

        }

    }

}

src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc 
        }

        RecyclerView view = mFragment.getListView();

        mEntityHeaderController.setRecyclerView(view, mLifecycle);

        mEntityHeaderController.styleActionBar((Activity) mContext);

    }



    @VisibleForTesting

src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java

+0 −3
Original line number Diff line number Diff line
@@ -122,9 +122,6 @@ public class ConversationHeaderPreferenceController extends NotificationPreferen 
    @OnLifecycleEvent(Lifecycle.Event.ON_START)

    public void onStart() {

        mStarted = true;

        if (mHeaderController != null) {

            mHeaderController.styleActionBar(mFragment.getActivity());

        }

    }



    @VisibleForTesting

src/com/android/settings/notification/app/HeaderPreferenceController.java

+0 −3
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ public class HeaderPreferenceController extends NotificationPreferenceController 
    @OnLifecycleEvent(Lifecycle.Event.ON_START)

    public void onStart() {

        mStarted = true;

        if (mHeaderController != null) {

            mHeaderController.styleActionBar(mFragment.getActivity());

        }

    }



    @VisibleForTesting