From fafdf08535534921e1c104887f04d3e5341e5ae5 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Thu, 14 Sep 2023 22:54:56 +0800 Subject: [PATCH] Refresh title in the Network details header - Since the title information may be updated later, it needs to be refreshed continuously to display the latest results. Bug: 299514568 Test: manual test atest -c WifiDetailPreferenceController2Test Merged-In: I4634c152b550c59bd9854cde1b91da44442aa879 Change-Id: I4634c152b550c59bd9854cde1b91da44442aa879 --- .../wifi/details2/WifiDetailPreferenceController2.java | 3 +-- .../wifi/details2/WifiDetailPreferenceController2Test.java | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java index d60193483af..0647a770915 100644 --- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java @@ -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) diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java index 88fa55f7184..406e0c3bf1e 100644 --- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java @@ -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)))