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

Add ConnectedAccessPointPreference

Browse Source 
This preference contains:
1. All the logic from AccessPointPreference
2. Gear icon on the right

Bug: 68807544
Test: RunSettingsRoboTests & Screenshot
Change-Id: I128401d81b075c4e9c5ca711562de26e73147745
This commit is contained in:
jackqdyulei
2017-11-02 11:24:35 -07:00
parent e717a5fdd1
commit fbede9c080
3 changed files with 173 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -782,7 +782,7 @@ public class WifiSettings extends RestrictedSettingsFragment
continue;
}
LongPressAccessPointPreference preference =
createLongPressActionPointPreference(accessPoint);
createLongPressAccessPointPreference(accessPoint);
preference.setKey(key);
preference.setOrder(index);
if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
@@ -817,10 +817,17 @@ public class WifiSettings extends RestrictedSettingsFragment
}
@NonNull
private LongPressAccessPointPreference createLongPressActionPointPreference(
private LongPressAccessPointPreference createLongPressAccessPointPreference(
AccessPoint accessPoint) {
return new LongPressAccessPointPreference(accessPoint, getPrefContext(), mUserBadgeCache,
false, R.drawable.ic_wifi_signal_0, this);
false /* forSavedNetworks */, R.drawable.ic_wifi_signal_0, this);
}
@NonNull
private ConnectedAccessPointPreference createConnectedAccessPointPreference(
AccessPoint accessPoint) {
return new ConnectedAccessPointPreference(accessPoint, getPrefContext(), mUserBadgeCache,
R.drawable.ic_wifi_signal_0, false /* forSavedNetworks */);
}
/**
@@ -859,7 +866,7 @@ public class WifiSettings extends RestrictedSettingsFragment
// Else same AP is connected, simply refresh the connected access point preference
// (first and only access point in this category).
((LongPressAccessPointPreference) mConnectedAccessPointPreferenceCategory.getPreference(0))
((AccessPointPreference) mConnectedAccessPointPreferenceCategory.getPreference(0))
.refresh();
return true;
}
@@ -869,20 +876,19 @@ public class WifiSettings extends RestrictedSettingsFragment
* {@link #mConnectedAccessPointPreferenceCategory}.
*/
private void addConnectedAccessPointPreference(AccessPoint connectedAp) {
final LongPressAccessPointPreference pref = getOrCreatePreference(connectedAp);
final ConnectedAccessPointPreference pref = createConnectedAccessPointPreference(
connectedAp);
// Launch details page on click.
pref.setOnPreferenceClickListener(preference -> {
// Save the state of the current access point in the bundle so that we can restore it
// in the Wifi Network Details Fragment
pref.setOnGearClickListener(l -> {
pref.getAccessPoint().saveWifiState(pref.getExtras());
SettingsActivity activity = (SettingsActivity) WifiSettings.this.getActivity();
activity.startPreferencePanel(this,
WifiNetworkDetailsFragment.class.getName(), pref.getExtras(),
R.string.wifi_details_title, null, null, 0);
return true;
});
pref.refresh();
mConnectedAccessPointPreferenceCategory.addPreference(pref);
@@ -893,15 +899,6 @@ public class WifiSettings extends RestrictedSettingsFragment
}
}
private LongPressAccessPointPreference getOrCreatePreference(AccessPoint ap) {
LongPressAccessPointPreference pref = (LongPressAccessPointPreference)
getCachedPreference(AccessPointPreference.generatePreferenceKey(ap));
if (pref == null) {
pref = createLongPressActionPointPreference(ap);
}
return pref;
}
/** Removes all preferences and hide the {@link #mConnectedAccessPointPreferenceCategory}. */
private void removeConnectedAccessPointPreference() {
mConnectedAccessPointPreferenceCategory.removeAll();
@@ -1093,7 +1090,7 @@ public class WifiSettings extends RestrictedSettingsFragment
public void run() {
Object tag = accessPoint.getTag();
if (tag != null) {
((LongPressAccessPointPreference) tag).refresh();
((AccessPointPreference) tag).refresh();
}
}
});
@@ -1102,7 +1099,7 @@ public class WifiSettings extends RestrictedSettingsFragment
@Override
public void onLevelChanged(AccessPoint accessPoint) {
((LongPressAccessPointPreference) accessPoint.getTag()).onLevelChanged();
((AccessPointPreference) accessPoint.getTag()).onLevelChanged();
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =