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

Commit 51749d44 authored Sep 15, 2023 by Treehugger Robot Committed by Automerger Merge Worker Sep 15, 2023

Merge "Refresh title in the Network details header" into udc-qpr-dev am: 6aaf49dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755454

Change-Id: Ic692b1ad20ae7a0ba31f2dbd6bfa3aa3cbb42024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 15d2faa3 6aaf49dc

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)))