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

Commit 6a3eb317 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev

parents 240b227e 2c3e6c64

AndroidManifest.xml

+1 −3
Original line number Original line Diff line number Diff line
@@ -2705,10 +2705,8 @@ 
            </intent-filter>

            </intent-filter>

        </activity>

        </activity>





        <activity

        <receiver

            android:name=".wifi.slice.ConnectToWifiHandler"

            android:name=".wifi.slice.ConnectToWifiHandler"

            android:theme="@android:style/Theme.NoDisplay"

            android:excludeFromRecents="true"

            android:exported="false" />

            android:exported="false" />





        <activity

        <activity

src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -33,12 +33,11 @@ import com.android.settings.R; 
import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.homepage.contextualcards.slices.SwipeDismissalDelegate;

import com.android.settings.homepage.contextualcards.slices.SwipeDismissalDelegate;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.wifi.slice.ContextualWifiScanWorker;





public class ContextualCardsFragment extends InstrumentedFragment implements

public class ContextualCardsFragment extends InstrumentedFragment implements

        FocusRecyclerView.FocusListener {

        FocusRecyclerView.FocusListener {





    private static final String TAG = "ContextualCardsFragment";



    private FocusRecyclerView mCardsContainer;

    private FocusRecyclerView mCardsContainer;

    private GridLayoutManager mLayoutManager;

    private GridLayoutManager mLayoutManager;

    private ContextualCardsAdapter mContextualCardsAdapter;

    private ContextualCardsAdapter mContextualCardsAdapter;
@@ -60,6 +59,7 @@ public class ContextualCardsFragment extends InstrumentedFragment implements 
    @Override

    @Override

    public void onStart() {

    public void onStart() {

        super.onStart();

        super.onStart();

        ContextualWifiScanWorker.newVisibleUiSession();

        mContextualCardManager.loadContextualCards(LoaderManager.getInstance(this));

        mContextualCardManager.loadContextualCards(LoaderManager.getInstance(this));

    }

    }

src/com/android/settings/slices/SlicesFeatureProvider.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -18,9 +18,9 @@ public interface SlicesFeatureProvider { 
    /**

    /**

     * Starts a new UI session for the purpose of using Slices.

     * Starts a new UI session for the purpose of using Slices.

     *

     *

     * A UI session is defined as an duration of time when user stays in a UI screen. Screen

     * A UI session is defined as a duration of time when user stays in a UI screen. Screen rotation

     * rotation does not break the continuation of session, going to a sub-page and coming out does

     * does not break the continuation of session, going to a sub-page and coming out does not break

     * not break the continuation either. Leaving the page and coming back breaks it.

     * the continuation either. Leaving the page and coming back breaks it.

     */

     */

    void newUiSession();

    void newUiSession();

src/com/android/settings/slices/SlicesFeatureProviderImpl.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ import com.android.settings.network.telephony.Enhanced4gLteSliceHelper; 
import com.android.settings.wifi.calling.WifiCallingSliceHelper;

import com.android.settings.wifi.calling.WifiCallingSliceHelper;

import com.android.settingslib.utils.ThreadUtils;

import com.android.settingslib.utils.ThreadUtils;





import java.util.Random;



/**

/**

 * Manages Slices in Settings.

 * Manages Slices in Settings.

 */

 */

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.settings.wifi.dpp.WifiDppUtils; 
import com.android.settingslib.wifi.AccessPoint;

import com.android.settingslib.wifi.AccessPoint;





/**

/**

 * {@link AbstractPreferenceController} that launches Wi-Fi Easy Connect configurator flow

 * {@link BasePreferenceController} that launches Wi-Fi Easy Connect configurator flow

 */

 */

public class AddDevicePreferenceController extends BasePreferenceController {

public class AddDevicePreferenceController extends BasePreferenceController {