Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up unused Sliceable.copy()" into tm-dev

Browse Source
This commit is contained in:
Chaohui Wang
2022-04-07 17:31:08 +00:00
committed by Android (Google) Code Review
parent 59c849da4d 6c9da58f4b
commit f2178a48ee
21 changed files with 153 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
View File

@@ -40,7 +40,6 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.slices.Sliceable;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -104,11 +103,6 @@ public class BuildNumberPreferenceController extends BasePreferenceController im
return true;
}
@Override
public void copy() {
Sliceable.setCopyContent(mContext, getSummary(), mContext.getText(R.string.build_number));
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {

16
src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
View File

@@ -16,16 +16,11 @@
package com.android.settings.deviceinfo;
import static android.content.Context.CLIPBOARD_SERVICE;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -98,17 +93,6 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
return true;
}
@Override
public void copy() {
final ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(
CLIPBOARD_SERVICE);
clipboard.setPrimaryClip(ClipData.newPlainText("text", getFirstPhoneNumber()));
final String toast = mContext.getString(R.string.copyable_slice_toast,
mContext.getText(R.string.status_number));
Toast.makeText(mContext, toast, Toast.LENGTH_SHORT).show();
}
private CharSequence getFirstPhoneNumber() {
final List<SubscriptionInfo> subscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList();

8
src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java
View File

@@ -28,10 +28,8 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.slices.Sliceable;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -125,10 +123,4 @@ public class FirmwareVersionDetailPreferenceController extends BasePreferenceCon
mFunDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
}
@Override
public void copy() {
Sliceable.setCopyContent(mContext, getSummary(),
mContext.getText(R.string.firmware_version));
}
}

7
src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
View File

@@ -22,7 +22,6 @@ import android.text.TextUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.slices.Sliceable;
public class HardwareRevisionPreferenceController extends BasePreferenceController {
@@ -41,12 +40,6 @@ public class HardwareRevisionPreferenceController extends BasePreferenceControll
return true;
}
@Override
public void copy() {
Sliceable.setCopyContent(mContext, getSummary(),
mContext.getText(R.string.hardware_revision));
}
@Override
public CharSequence getSummary() {
return SystemProperties.get("ro.boot.hardware.revision");

7
src/com/android/settings/deviceinfo/hardwareinfo/SerialNumberPreferenceController.java
View File

@@ -21,7 +21,6 @@ import android.os.Build;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.slices.Sliceable;
public class SerialNumberPreferenceController extends BasePreferenceController {
@@ -40,12 +39,6 @@ public class SerialNumberPreferenceController extends BasePreferenceController {
return true;
}
@Override
public void copy() {
Sliceable.setCopyContent(mContext, getSummary(),
mContext.getText(R.string.status_serial_number));
}
@Override
public CharSequence getSummary() {
return Build.getSerial();

6
src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
View File

@@ -33,7 +33,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.deviceinfo.PhoneNumberSummaryPreference;
import com.android.settings.slices.Sliceable;
import com.android.settingslib.Utils;
import java.util.ArrayList;
@@ -128,11 +127,6 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
return true;
}
@Override
public void copy() {
Sliceable.setCopyContent(mContext, getSummary(0), getTitle(0));
}
private void updatePreference(Preference preference, int simSlot) {
preference.setTitle(getTitle(simSlot));
preference.setSummary(getSummary(simSlot));