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

Merge "Fix overlapping problem on wifi detail screen" into qt-dev

Browse Source 
am: f59844570e

Change-Id: Ic7723df5c956208c71945dc2c0008fe4872a529b
This commit is contained in:
tmfang
2019-05-23 07:43:09 -07:00
committed by android-build-merger
parent 5b1b45b498 f59844570e
commit b50bdf2c13
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -54,7 +54,6 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.core.text.BidiFormatter; import androidx.core.text.BidiFormatter;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
@@ -151,7 +150,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
private AccessPoint mAccessPoint; private AccessPoint mAccessPoint;
private final ConnectivityManager mConnectivityManager; private final ConnectivityManager mConnectivityManager;
private final Fragment mFragment; private final PreferenceFragmentCompat mFragment;
private final Handler mHandler; private final Handler mHandler;
private LinkProperties mLinkProperties; private LinkProperties mLinkProperties;
private Network mNetwork; private Network mNetwork;
@@ -296,7 +295,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
AccessPoint accessPoint, AccessPoint accessPoint,
ConnectivityManager connectivityManager, ConnectivityManager connectivityManager,
Context context, Context context,
Fragment fragment, PreferenceFragmentCompat fragment,
Handler handler, Handler handler,
Lifecycle lifecycle, Lifecycle lifecycle,
WifiManager wifiManager, WifiManager wifiManager,
@@ -311,7 +310,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
AccessPoint accessPoint, AccessPoint accessPoint,
ConnectivityManager connectivityManager, ConnectivityManager connectivityManager,
Context context, Context context,
Fragment fragment, PreferenceFragmentCompat fragment,
Handler handler, Handler handler,
Lifecycle lifecycle, Lifecycle lifecycle,
WifiManager wifiManager, WifiManager wifiManager,
@@ -441,9 +440,11 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
if (usingDataUsageHeader(mContext)) { if (usingDataUsageHeader(mContext)) {
mSummaryHeaderController.updateState(mDataUsageSummaryPref); mSummaryHeaderController.updateState(mDataUsageSummaryPref);
} else { } else {
mEntityHeaderController.setSummary( mEntityHeaderController
mAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/)) .setSummary(
.done(mFragment.getActivity(), true /* rebind */); mAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
.setRecyclerView(mFragment.getListView(), mLifecycle)
.done(mFragment.getActivity(), true /* rebind */);
} }
} }