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

Merge ab/6749736 in stage.

Browse Source 
Bug: 167233921
Merged-In: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
Change-Id: I0411c2f1dbc2fa47b23ff52cacca990f3141f52f
This commit is contained in:
Xin Li
2020-10-08 23:40:50 -07:00
parent f0313f1328 064ba89fc3
commit 8656492241
16 changed files with 49 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
View File

@@ -63,7 +63,7 @@ public class BluetoothAvrcpVersionPreferenceController extends DeveloperOptionsP
public void updateState(Preference preference) {
final ListPreference listPreference = (ListPreference) preference;
final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
int index = 0; // Defaults to AVRCP 1.4
int index = 0; // Defaults to AVRCP 1.5
for (int i = 0; i < mListValues.length; i++) {
if (TextUtils.equals(currentValue, mListValues[i])) {
index = i;

1
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -479,7 +479,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new BluetoothMapVersionPreferenceController(context));
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
controllers.add(new EnhancedConnectivityPreferenceController(context));
controllers.add(new ShowTapsPreferenceController(context));
controllers.add(new PointerLocationPreferenceController(context));
controllers.add(new ShowSurfaceUpdatesPreferenceController(context));

87
src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
View File

@@ -1,87 +0,0 @@
/*
* Copyright (C) 2020 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.development;
import android.content.Context;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
/**
* Preference controller for Enhanced Connectivity feature
*/
public class EnhancedConnectivityPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String ENHANCED_CONNECTIVITY_KEY = "enhanced_connectivity";
@VisibleForTesting
static final int ENHANCED_CONNECTIVITY_ON = 1;
// default is enhanced connectivity enabled.
@VisibleForTesting
static final int ENHANCED_CONNECTIVITY_OFF = 0;
public EnhancedConnectivityPreferenceController(Context context) {
super(context);
}
@Override
public boolean onPreferenceChange(Preference preference, Object o) {
final boolean isEnabled = (Boolean) o;
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
isEnabled
? ENHANCED_CONNECTIVITY_ON
: ENHANCED_CONNECTIVITY_OFF);
return true;
}
@Override
public String getPreferenceKey() {
return ENHANCED_CONNECTIVITY_KEY;
}
@Override
public void updateState(Preference preference) {
final int enhancedConnectivityEnabled = Settings.Global.getInt(
mContext.getContentResolver(), Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
ENHANCED_CONNECTIVITY_ON);
((SwitchPreference) mPreference).setChecked(
enhancedConnectivityEnabled == ENHANCED_CONNECTIVITY_ON);
}
@Override
public boolean isAvailable() {
return mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
ENHANCED_CONNECTIVITY_ON);
((SwitchPreference) mPreference).setChecked(true);
}
}

2
src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java
View File

@@ -49,7 +49,7 @@ public class HardwareInfoPreferenceController extends BasePreferenceController {
@Override
public CharSequence getSummary() {
return mContext.getResources().getString(R.string.model_summary, getDeviceModel());
return getDeviceModel();
}
public static String getDeviceModel() {

6
src/com/android/settings/display/WallpaperPreferenceController.java
View File

@@ -92,7 +92,11 @@ public class WallpaperPreferenceController extends BasePreferenceController {
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (getPreferenceKey().equals(preference.getKey())) {
preference.getContext().startActivity(new Intent().setComponent(getComponentName()));
final Intent intent = new Intent().setComponent(getComponentName());
if (areStylesAvailable()) {
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
preference.getContext().startActivity(intent);
return true;
}
return super.handlePreferenceTreeClick(preference);

10
src/com/android/settings/network/telephony/NetworkOperatorPreference.java
View File

@@ -37,6 +37,7 @@ import android.util.Log;
import androidx.preference.Preference;
import com.android.internal.telephony.OperatorInfo;
import com.android.settings.R;
import java.util.List;
@@ -175,6 +176,15 @@ public class NetworkOperatorPreference extends Preference {
return CellInfoUtil.getNetworkTitle(mCellId, getOperatorNumeric());
}
/**
* Operator info of this cell
*/
public OperatorInfo getOperatorInfo() {
return new OperatorInfo(Objects.toString(mCellId.getOperatorAlphaLong(), ""),
Objects.toString(mCellId.getOperatorAlphaShort(), ""),
getOperatorNumeric());
}
private int getIconIdForCell(CellInfo ci) {
if (ci instanceof CellInfoGsm) {
return R.drawable.signal_strength_g;

5
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -40,6 +40,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.internal.telephony.OperatorInfo;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
@@ -185,12 +186,12 @@ public class NetworkSelectSettings extends DashboardFragment {
mRequestIdManualNetworkSelect = getNewRequestId();
mWaitingForNumberOfScanResults = MIN_NUMBER_OF_SCAN_REQUIRED;
final String operatorNumeric = mSelectedPreference.getOperatorNumeric();
final OperatorInfo operator = mSelectedPreference.getOperatorInfo();
ThreadUtils.postOnBackgroundThread(() -> {
final Message msg = mHandler.obtainMessage(
EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE);
msg.obj = mTelephonyManager.setNetworkSelectionModeManual(
operatorNumeric, true /* persistSelection */);
operator, true /* persistSelection */);
msg.sendToTarget();
});
}

16
src/com/android/settings/widget/SeekBarPreference.java
View File

@@ -51,6 +51,7 @@ public class SeekBarPreference extends RestrictedPreference
private boolean mShouldBlink;
private int mAccessibilityRangeInfoType = AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT;
private CharSequence mSeekBarContentDescription;
private CharSequence mSeekBarStateDescription;
public SeekBarPreference(
Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -124,6 +125,9 @@ public class SeekBarPreference extends RestrictedPreference
} else if (!TextUtils.isEmpty(title)) {
mSeekBar.setContentDescription(title);
}
if (!TextUtils.isEmpty(mSeekBarStateDescription)) {
mSeekBar.setStateDescription(mSeekBarStateDescription);
}
if (mSeekBar instanceof DefaultIndicatorSeekBar) {
((DefaultIndicatorSeekBar) mSeekBar).setDefaultProgress(mDefaultProgress);
}
@@ -304,6 +308,18 @@ public class SeekBarPreference extends RestrictedPreference
}
}
/**
* Specify the state description for this seek bar represents.
*
* @param stateDescription the state description of seek bar
*/
public void setSeekBarStateDescription(CharSequence stateDescription) {
mSeekBarStateDescription = stateDescription;
if (mSeekBar != null) {
mSeekBar.setStateDescription(stateDescription);
}
}
@Override
protected Parcelable onSaveInstanceState() {
/*