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

[Foldable] Show full screen "Install Certificates" for large screen devices

Browse Source 
Uses Intent.FLAG_ACTIVITY_NEW_TASK to start the Activity

Test: manual
Bug: 197701944
Change-Id: I6d52bae5ceb399c0869ef0c76d89f16867a83065
This commit is contained in:
Zoey Chen
2021-10-16 01:02:58 +08:00
parent 44c07ccd65
commit eb19d4ba59
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/xml/wifi_configure_settings.xml
View File

@@ -42,15 +42,7 @@
<Preference <Preference
android:key="install_credentials" android:key="install_credentials"
android:title="@string/wifi_install_credentials"> android:title="@string/wifi_install_credentials"/>
<intent
android:action="android.credentials.INSTALL"
android:targetPackage="com.android.certinstaller"
android:targetClass="com.android.certinstaller.CertInstallerMain">
<!-- Same value as CERTIFICATE_USAGE_WIFI in keystore/java/android/security/Credentials.java -->
<extra android:name="certificate_install_usage" android:value="wifi"/>
</intent>
</Preference>
<Preference <Preference
android:key="wifi_direct" android:key="wifi_direct"

28
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -18,11 +18,16 @@ package com.android.settings.wifi;
import static android.content.Context.WIFI_SERVICE; import static android.content.Context.WIFI_SERVICE;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
import android.util.FeatureFlagUtils; import android.util.FeatureFlagUtils;
import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
@@ -38,10 +43,17 @@ import java.util.List;
public class ConfigureWifiSettings extends DashboardFragment { public class ConfigureWifiSettings extends DashboardFragment {
private static final String TAG = "ConfigureWifiSettings"; private static final String TAG = "ConfigureWifiSettings";
private static final String KEY_INSTALL_CREDENTIALS = "install_credentials";
private static final String ACTION_INSTALL_CERTS = "android.credentials.INSTALL";
private static final String PACKAGE_INSTALL_CERTS = "com.android.certinstaller";
private static final String CLASS_INSTALL_CERTS = "com.android.certinstaller.CertInstallerMain";
private static final String KEY_INSTALL_CERTIFICATE = "certificate_install_usage";
private static final String INSTALL_CERTIFICATE_VALUE = "wifi";
public static final int WIFI_WAKEUP_REQUEST_CODE = 600; public static final int WIFI_WAKEUP_REQUEST_CODE = 600;
private WifiWakeupPreferenceController mWifiWakeupPreferenceController; private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
private Preference mCertinstallerPreference;
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
@@ -49,6 +61,22 @@ public class ConfigureWifiSettings extends DashboardFragment {
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
getActivity().setTitle(R.string.network_and_internet_preferences_title); getActivity().setTitle(R.string.network_and_internet_preferences_title);
} }
mCertinstallerPreference = findPreference(KEY_INSTALL_CREDENTIALS);
if (mCertinstallerPreference != null) {
mCertinstallerPreference.setOnPreferenceClickListener(preference -> {
Intent intent = new Intent(ACTION_INSTALL_CERTS);
intent.setFlags(
Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setComponent(
new ComponentName(PACKAGE_INSTALL_CERTS, CLASS_INSTALL_CERTS));
intent.putExtra(KEY_INSTALL_CERTIFICATE, INSTALL_CERTIFICATE_VALUE);
getContext().startActivity(intent);
return true;
});
} else {
Log.d(TAG, "Can not find the preference.");
}
} }
@Override @Override