c6b4f3d92c
Whenever a user has connected to a captive portal network, split the
ConnectedAccessPointPreference to allow directly signing into the
captive portal or modifying the network's settings. When in any other
network state, use the old behavior of a single tappable preference that
takes the user to settings.
Bug: 63929546
Bug: 68031656
Test: make RunSettingsRoboTests
Test: manual by connecting to Captive Portal and normal WiFi networks.
Change-Id: I444202a12138d90c94bda94945c121c8c0810536
(cherry picked from commit 7577624db7)
95 lines
3.1 KiB
Java
95 lines
3.1 KiB
Java
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.wifi;
|
|
|
|
import android.content.Context;
|
|
import android.support.annotation.DrawableRes;
|
|
import android.support.v7.preference.PreferenceViewHolder;
|
|
import android.view.View;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settingslib.wifi.AccessPoint;
|
|
import com.android.settingslib.wifi.AccessPointPreference;
|
|
|
|
/**
|
|
* An AP preference for the currently connected AP
|
|
*/
|
|
public class ConnectedAccessPointPreference extends AccessPointPreference implements
|
|
View.OnClickListener {
|
|
|
|
private final CaptivePortalStatus mCaptivePortalStatus;
|
|
private OnGearClickListener mOnGearClickListener;
|
|
private boolean mCaptivePortalNetwork;
|
|
|
|
public ConnectedAccessPointPreference(AccessPoint accessPoint, Context context,
|
|
UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks,
|
|
CaptivePortalStatus captivePortalStatus) {
|
|
super(accessPoint, context, cache, iconResId, forSavedNetworks);
|
|
mCaptivePortalStatus = captivePortalStatus;
|
|
}
|
|
|
|
@Override
|
|
protected int getWidgetLayoutResourceId() {
|
|
return R.layout.preference_widget_gear_optional_background;
|
|
}
|
|
|
|
@Override
|
|
public void refresh() {
|
|
super.refresh();
|
|
|
|
mCaptivePortalNetwork = mCaptivePortalStatus.isCaptivePortalNetwork();
|
|
setShowDivider(mCaptivePortalNetwork);
|
|
if (mCaptivePortalNetwork) {
|
|
setSummary(R.string.wifi_tap_to_sign_in);
|
|
}
|
|
}
|
|
|
|
public void setOnGearClickListener(OnGearClickListener l) {
|
|
mOnGearClickListener = l;
|
|
notifyChanged();
|
|
}
|
|
|
|
@Override
|
|
public void onBindViewHolder(PreferenceViewHolder holder) {
|
|
super.onBindViewHolder(holder);
|
|
|
|
final View gear = holder.findViewById(R.id.settings_button);
|
|
gear.setOnClickListener(this);
|
|
|
|
final View gearNoBg = holder.findViewById(R.id.settings_button_no_background);
|
|
gearNoBg.setVisibility(mCaptivePortalNetwork ? View.INVISIBLE : View.VISIBLE);
|
|
gear.setVisibility(mCaptivePortalNetwork ? View.VISIBLE : View.INVISIBLE);
|
|
}
|
|
|
|
@Override
|
|
public void onClick(View v) {
|
|
if (v.getId() == R.id.settings_button) {
|
|
if (mOnGearClickListener != null) {
|
|
mOnGearClickListener.onGearClick(this);
|
|
}
|
|
}
|
|
}
|
|
|
|
public interface OnGearClickListener {
|
|
void onGearClick(ConnectedAccessPointPreference p);
|
|
}
|
|
|
|
public interface CaptivePortalStatus {
|
|
boolean isCaptivePortalNetwork();
|
|
}
|
|
}
|