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

Snap for 7977275 from f6354d8af7 to sc-v2-release

Browse Source 
Change-Id: I3c88eb689a726d83c6dbcb2eed94b4eb80a280b3
This commit is contained in:
Android Build Coastguard Worker
2021-12-08 00:08:37 +00:00
parent 93c88314de f6354d8af7
commit 59817805bc
5 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
AndroidManifest.xml
View File

@@ -1257,6 +1257,23 @@
android:value="true" />
</activity>
<activity
android:name=".Settings$BlueToothPairingActivity"
android:label="@string/bluetooth_pairing_page_title"
android:permission="android.permission.BLUETOOTH_SCAN"
android:exported="true">
<intent-filter android:priority="1">
<action android:name="android.settings.BLUETOOTH_PAIRING_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.bluetooth.BluetoothPairingDetail" />
<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
android:value="@string/menu_key_connected_devices"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
<activity
android:name="SettingsLicenseActivity"
android:label="@string/settings_license_activity_title"

2
src/com/android/settings/Settings.java
View File

@@ -123,6 +123,8 @@ public class Settings extends SettingsActivity {
public static class AccessibilityDaltonizerSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity for lockscreen settings. */
public static class LockScreenSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity for bluetooth pairing settings. */
public static class BlueToothPairingActivity extends SettingsActivity { /* empty */ }
/** Activity for Reduce Bright Colors. */
public static class ReduceBrightColorsSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity for the security dashboard. */

2
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -68,6 +68,7 @@ import com.android.settings.biometrics.combination.CombinedBiometricSettings;
import com.android.settings.biometrics.face.FaceSettings;
import com.android.settings.biometrics.fingerprint.FingerprintSettings;
import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
import com.android.settings.bluetooth.BluetoothPairingDetail;
import com.android.settings.bugreporthandler.BugReportHandlerPicker;
import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
@@ -175,6 +176,7 @@ public class SettingsGateway {
public static final String[] ENTRY_FRAGMENTS = {
AdvancedConnectedDeviceDashboardFragment.class.getName(),
CreateShortcut.class.getName(),
BluetoothPairingDetail.class.getName(),
WifiSettings.class.getName(),
WifiNetworkDetailsFragment.class.getName(),
ConfigureWifiSettings.class.getName(),

12
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -1503,11 +1503,15 @@ public class WifiConfigController implements TextWatcher,
}
// Shows display name of each active subscription.
final String[] displayNames = SubscriptionUtil.getUniqueSubscriptionDisplayNames(
mContext).values().stream().toArray(String[]::new);
mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));
final ArrayList<CharSequence> displayNames = new ArrayList<>();
for (SubscriptionInfo activeSubInfo : mActiveSubscriptionInfos) {
displayNames.add(
SubscriptionUtil.getUniqueSubscriptionDisplayName(activeSubInfo, mContext));
}
mEapSimSpinner.setAdapter(
getSpinnerAdapter(displayNames.toArray(new String[displayNames.size()])));
mEapSimSpinner.setSelection(0 /* position */);
if (displayNames.length == 1) {
if (displayNames.size() == 1) {
mEapSimSpinner.setEnabled(false);
}
}

12
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -1482,11 +1482,15 @@ public class WifiConfigController2 implements TextWatcher,
}
// Shows display name of each active subscription.
final String[] displayNames = SubscriptionUtil.getUniqueSubscriptionDisplayNames(
mContext).values().stream().toArray(String[]::new);
mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));
final ArrayList<CharSequence> displayNames = new ArrayList<>();
for (SubscriptionInfo activeSubInfo : mActiveSubscriptionInfos) {
displayNames.add(
SubscriptionUtil.getUniqueSubscriptionDisplayName(activeSubInfo, mContext));
}
mEapSimSpinner.setAdapter(
getSpinnerAdapter(displayNames.toArray(new String[displayNames.size()])));
mEapSimSpinner.setSelection(0 /* position */);
if (displayNames.length == 1) {
if (displayNames.size() == 1) {
mEapSimSpinner.setEnabled(false);
}
}