[WIFI-Enterprise] Add Server name field.
Test: Unit Test Fix: 333855426 Change-Id: Idfcb5f4efd36257188b04e2be7c7dc1127681b06
This commit is contained in:
@@ -56,6 +56,7 @@ import com.android.settings.wifi.WifiDialog2;
|
||||
import com.android.settings.wifi.WifiUtils;
|
||||
import com.android.settings.wifi.details2.AddDevicePreferenceController2;
|
||||
import com.android.settings.wifi.details2.CertificateDetailsPreferenceController;
|
||||
import com.android.settings.wifi.details2.ServerNamePreferenceController;
|
||||
import com.android.settings.wifi.details2.WifiAutoConnectPreferenceController2;
|
||||
import com.android.settings.wifi.details2.WifiDetailPreferenceController2;
|
||||
import com.android.settings.wifi.details2.WifiMeteredPreferenceController2;
|
||||
@@ -129,6 +130,8 @@ public class WifiNetworkDetailsFragment extends RestrictedDashboardFragment impl
|
||||
.setWifiEntryKey(wifiEntryKey);
|
||||
use(CertificateDetailsPreferenceController.class)
|
||||
.setWifiEntry(mNetworkDetailsTracker.getWifiEntry());
|
||||
use(ServerNamePreferenceController.class)
|
||||
.setWifiEntry(mNetworkDetailsTracker.getWifiEntry());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -0,0 +1,56 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.details2
|
||||
|
||||
import android.content.Context
|
||||
import android.util.Log
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import com.android.settings.R
|
||||
import com.android.settings.spa.preference.ComposePreferenceController
|
||||
import com.android.settingslib.spa.widget.preference.Preference
|
||||
import com.android.settingslib.spa.widget.preference.PreferenceModel
|
||||
import com.android.wifi.flags.Flags
|
||||
import com.android.wifitrackerlib.WifiEntry
|
||||
|
||||
class ServerNamePreferenceController(context: Context, preferenceKey: String) :
|
||||
ComposePreferenceController(context, preferenceKey) {
|
||||
|
||||
private lateinit var wifiEntry: WifiEntry
|
||||
|
||||
fun setWifiEntry(entry: WifiEntry) {
|
||||
wifiEntry = entry
|
||||
}
|
||||
|
||||
override fun getAvailabilityStatus(): Int {
|
||||
return if (Flags.androidVWifiApi() && wifiEntry.certificateInfo?.domain != null) AVAILABLE
|
||||
else CONDITIONALLY_UNAVAILABLE
|
||||
}
|
||||
|
||||
@Composable
|
||||
override fun Content() {
|
||||
ServerName()
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun ServerName() {
|
||||
Preference(object : PreferenceModel {
|
||||
override val title = stringResource(R.string.server_name_title)
|
||||
override val summary = { wifiEntry.certificateInfo?.domain ?: "" }
|
||||
})
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user