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

Commit 2ff083c2 authored by tmfang's avatar tmfang
Browse files

Fix overlapping problem on wifi detail screen 

If we didn't set view and lifecycle for EntityHeaderController,
it only sets "z-order" as 0 for action bar.

So, user sees overlapped problem while user is scrolling view.

For now, we set view and lifecycle as parameter for EntityHeaderController,
then EntityHeaderController can change "z-order" while scrolling view.

Test: visual and robo test
Fixes: 133380109
Change-Id: I0445c6aeaa42d798374d2c712e9611a09a6b55e7
parent 089d85f3

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+8 −7
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import android.widget.Toast; 


import androidx.annotation.VisibleForTesting;

import androidx.core.text.BidiFormatter;

import androidx.fragment.app.Fragment;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceFragmentCompat;
@@ -151,7 +150,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 


    private AccessPoint mAccessPoint;

    private final ConnectivityManager mConnectivityManager;

    private final Fragment mFragment;

    private final PreferenceFragmentCompat mFragment;

    private final Handler mHandler;

    private LinkProperties mLinkProperties;

    private Network mNetwork;
@@ -296,7 +295,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
            AccessPoint accessPoint,

            ConnectivityManager connectivityManager,

            Context context,

            Fragment fragment,

            PreferenceFragmentCompat fragment,

            Handler handler,

            Lifecycle lifecycle,

            WifiManager wifiManager,
@@ -311,7 +310,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
            AccessPoint accessPoint,

            ConnectivityManager connectivityManager,

            Context context,

            Fragment fragment,

            PreferenceFragmentCompat fragment,

            Handler handler,

            Lifecycle lifecycle,

            WifiManager wifiManager,
@@ -441,8 +440,10 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
        if (usingDataUsageHeader(mContext)) {

            mSummaryHeaderController.updateState(mDataUsageSummaryPref);

        } else {

            mEntityHeaderController.setSummary(

            mEntityHeaderController

                    .setSummary(

                            mAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))

                    .setRecyclerView(mFragment.getListView(), mLifecycle)

                    .done(mFragment.getActivity(), true /* rebind */);

        }

    }