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

Commit 6fa6b49f authored by Jiaming Cheng's avatar Jiaming Cheng
Browse files

[QSDetailedView] Apply details view UI style after view binding. 

Move the application of UI styles for the details view to after
the view is bound.

Previously, this happened before binding, meaning the icon drawable
was not yet available. This resulted in incorrect colors being
applied.

Bug: 378514300
Flag: com.android.systemui.qs_tile_detailed_view
Test: Only change the icon colors. Existing unit tests still pass.
Change-Id: I1f7068b879858595b12715ac124157d6d9351183
parent 39ad9801

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java

+15 −16
Original line number Diff line number Diff line
@@ -168,12 +168,21 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern 
            mWifiTitleText = view.requireViewById(R.id.wifi_title);

            mWifiSummaryText = view.requireViewById(R.id.wifi_summary);

            mWifiEndIcon = view.requireViewById(R.id.wifi_end_icon);



            if (!isInDetailsView){

                return;

        }



        void onBind(@NonNull WifiEntry wifiEntry) {

            mWifiIcon.setImageDrawable(getWifiDrawable(wifiEntry));

            setWifiNetworkLayout(wifiEntry.getTitle(),

                    Html.fromHtml(wifiEntry.getSummary(false), Html.FROM_HTML_MODE_LEGACY));



            final int connectedState = wifiEntry.getConnectedState();

            final int security = wifiEntry.getSecurity();

            updateEndIcon(connectedState, security);



            mWifiListLayout.setEnabled(shouldEnabled(wifiEntry));



            // Set the UI styles for details view only.

            if (mIsInDetailsView) {

                mWifiTitleText.setTextAppearance(R.style.TextAppearance_TileDetailsEntryTitle);

                mWifiSummaryText.setTextAppearance(R.style.TextAppearance_TileDetailsEntrySubTitle);

                if (mWifiIcon.getDrawable() != null) {
@@ -186,16 +195,6 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern 
                }

            }



        void onBind(@NonNull WifiEntry wifiEntry) {

            mWifiIcon.setImageDrawable(getWifiDrawable(wifiEntry));

            setWifiNetworkLayout(wifiEntry.getTitle(),

                    Html.fromHtml(wifiEntry.getSummary(false), Html.FROM_HTML_MODE_LEGACY));



            final int connectedState = wifiEntry.getConnectedState();

            final int security = wifiEntry.getSecurity();

            updateEndIcon(connectedState, security);



            mWifiListLayout.setEnabled(shouldEnabled(wifiEntry));

            if (connectedState != WifiEntry.CONNECTED_STATE_DISCONNECTED) {

                mWifiListLayout.setOnClickListener(

                        v -> mInternetDetailsContentController.launchWifiDetailsSetting(