Merge Copyable into Sliceable.

It's only a slice concept. Regular preference copyability is handled in
xml.

Bug: 112427717
Test: rebuild
Change-Id: Iaba7077c320cd03a5963797916a60e0dc80fdbbe
This commit is contained in:
Fan Zhang
2019-02-25 12:46:34 -08:00
parent aef472d0ca
commit e0a722e130
9 changed files with 65 additions and 69 deletions

View File

@@ -42,7 +42,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.Copyable;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -50,7 +49,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
public class BuildNumberPreferenceController extends BasePreferenceController implements Copyable,
public class BuildNumberPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnStart {
static final int TAPS_TO_BE_A_DEVELOPER = 7;
@@ -108,6 +107,11 @@ public class BuildNumberPreferenceController extends BasePreferenceController im
return true;
}
@Override
public boolean isCopyableSlice() {
return true;
}
@Override
public void copy() {
final ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(

View File

@@ -35,14 +35,12 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.slices.Copyable;
import com.android.settingslib.DeviceInfoUtils;
import java.util.ArrayList;
import java.util.List;
public class PhoneNumberPreferenceController extends BasePreferenceController implements
Copyable {
public class PhoneNumberPreferenceController extends BasePreferenceController {
private final static String KEY_PHONE_NUMBER = "phone_number";
@@ -98,6 +96,11 @@ public class PhoneNumberPreferenceController extends BasePreferenceController im
return true;
}
@Override
public boolean isCopyableSlice() {
return true;
}
@Override
public void copy() {
final ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(

View File

@@ -31,12 +31,11 @@ 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.Copyable;
import com.android.settings.slices.Sliceable;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
public class FirmwareVersionDetailPreferenceController extends BasePreferenceController implements
Copyable {
public class FirmwareVersionDetailPreferenceController extends BasePreferenceController {
private static final String TAG = "firmwareDialogCtrl";
private static final int DELAY_TIMER_MILLIS = 500;
@@ -119,7 +118,7 @@ public class FirmwareVersionDetailPreferenceController extends BasePreferenceCon
@Override
public void copy() {
Copyable.setCopyContent(mContext, getSummary(),
Sliceable.setCopyContent(mContext, getSummary(),
mContext.getText(R.string.firmware_version));
}
}

View File

@@ -29,7 +29,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.slices.Copyable;
import com.android.settings.slices.Sliceable;
import com.android.settingslib.Utils;
import java.util.ArrayList;
@@ -38,7 +38,7 @@ import java.util.List;
/**
* Controller that manages preference for single and multi sim devices.
*/
public class ImeiInfoPreferenceController extends BasePreferenceController implements Copyable {
public class ImeiInfoPreferenceController extends BasePreferenceController {
private final boolean mIsMultiSim;
private final TelephonyManager mTelephonyManager;
@@ -105,9 +105,14 @@ public class ImeiInfoPreferenceController extends BasePreferenceController imple
return true;
}
@Override
public boolean isCopyableSlice() {
return true;
}
@Override
public void copy() {
Copyable.setCopyContent(mContext, getSummary(), mContext.getText(R.string.status_imei));
Sliceable.setCopyContent(mContext, getSummary(), mContext.getText(R.string.status_imei));
}
private void updatePreference(Preference preference, int simSlot) {