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

Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment"

Browse Source
This commit is contained in:
Alex Salo
2020-11-16 21:45:34 +00:00
committed by Android (Google) Code Review
parent 67a9908db4 8881f91349
commit 65c319a7d5
5 changed files with 331 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
View File

@@ -16,9 +16,17 @@
package com.android.settings.wifi.dpp;
import android.annotation.Nullable;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -27,9 +35,13 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.chooser.DisplayResolveInfo;
import com.android.internal.app.chooser.TargetInfo;
import com.android.settings.R;
import com.android.settings.wifi.qrcode.QrCodeGenerator;
@@ -45,6 +57,15 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
private ImageView mQrCodeView;
private String mQrCode;
private static final String CHIP_LABEL_METADATA_KEY = "android.service.chooser.chip_label";
private static final String CHIP_ICON_METADATA_KEY = "android.service.chooser.chip_icon";
private static final String EXTRA_WIFI_CREDENTIALS_BUNDLE =
"android.intent.extra.WIFI_CREDENTIALS_BUNDLE";
private static final String EXTRA_SSID = "android.intent.extra.SSID";
private static final String EXTRA_PASSWORD = "android.intent.extra.PASSWORD";
private static final String EXTRA_SECURITY_TYPE = "android.intent.extra.SECURITY_TYPE";
private static final String EXTRA_HIDDEN_SSID = "android.intent.extra.HIDDEN_SSID";
@Override
public int getMetricsCategory() {
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
@@ -56,10 +77,12 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
// setTitle for TalkBack
final WifiNetworkConfig wifiNetworkConfig = getWifiNetworkConfigFromHostActivity();
if (wifiNetworkConfig.isHotspot()) {
getActivity().setTitle(R.string.wifi_dpp_share_hotspot);
} else {
getActivity().setTitle(R.string.wifi_dpp_share_wifi);
if (getActivity() != null) {
if (wifiNetworkConfig.isHotspot()) {
getActivity().setTitle(R.string.wifi_dpp_share_hotspot);
} else {
getActivity().setTitle(R.string.wifi_dpp_share_wifi);
}
}
}
@@ -112,10 +135,127 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
}
}
final Intent intent = new Intent().setComponent(getNearbySharingComponent());
addActionButton(view.findViewById(R.id.wifi_dpp_layout), createNearbyButton(intent, v -> {
intent.setAction(Intent.ACTION_SEND);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
Bundle wifiCredentialBundle = new Bundle();
String ssid = WifiDppUtils.removeFirstAndLastDoubleQuotes(wifiNetworkConfig.getSsid());
String passwordExtra = wifiNetworkConfig.getPreSharedKey();
String securityType = wifiNetworkConfig.getSecurity();
boolean hiddenSsid = wifiNetworkConfig.getHiddenSsid();
wifiCredentialBundle.putString(EXTRA_SSID, ssid);
wifiCredentialBundle.putString(EXTRA_PASSWORD, passwordExtra);
wifiCredentialBundle.putString(EXTRA_SECURITY_TYPE, securityType);
wifiCredentialBundle.putBoolean(EXTRA_HIDDEN_SSID, hiddenSsid);
intent.putExtra(EXTRA_WIFI_CREDENTIALS_BUNDLE, wifiCredentialBundle);
startActivity(intent);
}));
mQrCode = wifiNetworkConfig.getQrCode();
setQrCode();
}
@VisibleForTesting ComponentName getNearbySharingComponent() {
String nearbyComponent = Settings.Secure.getString(
getContext().getContentResolver(),
Settings.Secure.NEARBY_SHARING_COMPONENT);
if (TextUtils.isEmpty(nearbyComponent)) {
nearbyComponent = getString(
com.android.internal.R.string.config_defaultNearbySharingComponent);
}
if (TextUtils.isEmpty(nearbyComponent)) {
return null;
}
return ComponentName.unflattenFromString(nearbyComponent);
}
private TargetInfo getNearbySharingTarget(Intent originalIntent) {
final ComponentName cn = getNearbySharingComponent();
if (cn == null) return null;
final Intent resolveIntent = new Intent(originalIntent);
resolveIntent.setComponent(cn);
PackageManager pm = getContext().getPackageManager();
final ResolveInfo resolveInfo = pm.resolveActivity(
resolveIntent, PackageManager.GET_META_DATA);
if (resolveInfo == null || resolveInfo.activityInfo == null) {
Log.e(TAG, "Device-specified nearby sharing component (" + cn
+ ") not available");
return null;
}
// Allow the nearby sharing component to provide a more appropriate icon and label
// for the chip.
CharSequence name = null;
Drawable icon = null;
final Bundle metaData = resolveInfo.activityInfo.metaData;
if (metaData != null) {
try {
final Resources pkgRes = pm.getResourcesForActivity(cn);
final int nameResId = metaData.getInt(CHIP_LABEL_METADATA_KEY);
name = pkgRes.getString(nameResId);
final int resId = metaData.getInt(CHIP_ICON_METADATA_KEY);
icon = pkgRes.getDrawable(resId);
} catch (Resources.NotFoundException ex) {
} catch (PackageManager.NameNotFoundException ex) {
}
}
if (TextUtils.isEmpty(name)) {
name = resolveInfo.loadLabel(pm);
}
if (icon == null) {
icon = resolveInfo.loadIcon(pm);
}
final DisplayResolveInfo dri = new DisplayResolveInfo(
originalIntent, resolveInfo, name, "", resolveIntent, null);
dri.setDisplayIcon(icon);
return dri;
}
private Button createActionButton(Drawable icon, CharSequence title, View.OnClickListener r) {
Button b = (Button) LayoutInflater.from(getContext()).inflate(
com.android.internal.R.layout.chooser_action_button, null);
if (icon != null) {
final int size = getResources()
.getDimensionPixelSize(
com.android.internal.R.dimen.chooser_action_button_icon_size);
icon.setBounds(0, 0, size, size);
b.setCompoundDrawablesRelative(icon, null, null, null);
}
b.setText(title);
b.setOnClickListener(r);
return b;
}
private void addActionButton(ViewGroup parent, Button b) {
if (b == null) return;
final ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT
);
final int gap = getResources().getDimensionPixelSize(
com.android.internal.R.dimen.resolver_icon_margin) / 2;
lp.setMarginsRelative(gap, 0, gap, 0);
parent.addView(b, lp);
}
@VisibleForTesting
@Nullable
Button createNearbyButton(Intent originalIntent, View.OnClickListener r) {
final TargetInfo ti = getNearbySharingTarget(originalIntent);
if (ti == null) return null;
return createActionButton(ti.getDisplayIcon(getContext()), ti.getDisplayLabel(), r);
}
private void setQrCode() {
try {
final int qrcodeSize = getContext().getResources().getDimensionPixelSize(

2
src/com/android/settings/wifi/dpp/WifiDppUtils.java
View File

@@ -145,7 +145,7 @@ public class WifiDppUtils {
return wifiConfiguration.preSharedKey;
}
private static String removeFirstAndLastDoubleQuotes(String str) {
static String removeFirstAndLastDoubleQuotes(String str) {
if (TextUtils.isEmpty(str)) {
return str;
}