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

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

Merge "Refresh title in the Network details header" into udc-qpr-dev

parents dc677b1d fafdf085

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+1 −2
Original line number Diff line number Diff line
@@ -451,8 +451,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
        ImageView iconView = headerPref.findViewById(R.id.entity_header_icon);



        iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);



        mEntityHeaderController.setLabel(mWifiEntry.getTitle());

    }



    private String getExpiryTimeSummary() {
@@ -491,6 +489,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
            mSummaryHeaderController.updateState(mDataUsageSummaryPref);

        } else {

            mEntityHeaderController

                    .setLabel(mWifiEntry.getTitle())

                    .setSummary(mWifiEntry.getSummary())

                    .setSecondSummary(getExpiryTimeSummary())

                    .setRecyclerView(mFragment.getListView(), mLifecycle)

tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java

+2 −0
Original line number Diff line number Diff line
@@ -305,6 +305,8 @@ public class WifiDetailPreferenceController2Test { 


        ShadowEntityHeaderController.setUseMock(mMockHeaderController);

        // builder pattern

        when(mMockHeaderController.setLabel(any(CharSequence.class)))

                .thenReturn(mMockHeaderController);

        when(mMockHeaderController.setRecyclerView(mMockFragment.getListView(), mLifecycle))

                .thenReturn(mMockHeaderController);

        when(mMockHeaderController.setSummary(nullable(String.class)))