PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refresh title in the Network details header" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-14 22:08:05 +00:00
committed by Android (Google) Code Review
parent 8a416501d2 54d0709409
commit 40265208e5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -20,6 +20,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVIT
import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID; import static android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID;
import static com.android.settingslib.wifi.WifiUtils.getHotspotIconResource; import static com.android.settingslib.wifi.WifiUtils.getHotspotIconResource;
import android.app.Activity; import android.app.Activity;
@@ -428,8 +429,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
ImageView iconView = headerPref.findViewById(R.id.entity_header_icon); ImageView iconView = headerPref.findViewById(R.id.entity_header_icon);
iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE); iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
mEntityHeaderController.setLabel(mWifiEntry.getTitle());
} }
private String getExpiryTimeSummary() { private String getExpiryTimeSummary() {
@@ -465,6 +464,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
private void refreshEntityHeader() { private void refreshEntityHeader() {
mEntityHeaderController mEntityHeaderController
.setLabel(mWifiEntry.getTitle())
.setSummary(mWifiEntry.getSummary()) .setSummary(mWifiEntry.getSummary())
.setSecondSummary(getExpiryTimeSummary()) .setSecondSummary(getExpiryTimeSummary())
.done(true /* rebind */); .done(true /* rebind */);

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

@@ -305,6 +305,8 @@ public class WifiDetailPreferenceController2Test {
ShadowEntityHeaderController.setUseMock(mMockHeaderController); ShadowEntityHeaderController.setUseMock(mMockHeaderController);
// builder pattern // builder pattern
when(mMockHeaderController.setLabel(any(CharSequence.class)))
.thenReturn(mMockHeaderController);
when(mMockHeaderController.setSummary(nullable(String.class))) when(mMockHeaderController.setSummary(nullable(String.class)))
.thenReturn(mMockHeaderController); .thenReturn(mMockHeaderController);
when(mMockHeaderController.setSecondSummary(nullable(String.class))) when(mMockHeaderController.setSecondSummary(nullable(String.class)))