Remove old PK settings pages that are unused
Test: manual Bug: 330517633 Flag: EXEMPT cleanup Change-Id: I2e0e21cf13ae39a09cd8c7b3697bbf18188e1fa8
This commit is contained in:
Vaibhav Devmurari
@@ -20,12 +20,10 @@ import android.app.Activity;
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.database.ContentObserver;
|
||||
import android.hardware.input.InputDeviceIdentifier;
|
||||
import android.hardware.input.InputManager;
|
||||
import android.hardware.input.InputSettings;
|
||||
import android.hardware.input.KeyboardLayout;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
@@ -47,7 +45,6 @@ import androidx.preference.TwoStatePreference;
|
||||
|
||||
import com.android.internal.util.Preconditions;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Settings;
|
||||
import com.android.settings.core.SubSettingLauncher;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.keyboard.Flags;
|
||||
@@ -66,8 +63,7 @@ import java.util.Objects;
|
||||
// controllers between here and A11y Setting page.
|
||||
@SearchIndexable
|
||||
public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
implements InputManager.InputDeviceListener,
|
||||
KeyboardLayoutDialogFragment.OnSetupKeyboardLayoutsListener {
|
||||
implements InputManager.InputDeviceListener {
|
||||
|
||||
private static final String KEYBOARD_OPTIONS_CATEGORY = "keyboard_options_category";
|
||||
private static final String KEYBOARD_A11Y_CATEGORY = "keyboard_a11y_category";
|
||||
@@ -79,6 +75,7 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
private static final String KEYBOARD_SHORTCUTS_HELPER = "keyboard_shortcuts_helper";
|
||||
private static final String MODIFIER_KEYS_SETTINGS = "modifier_keys_settings";
|
||||
private static final String EXTRA_AUTO_SELECTION = "auto_selection";
|
||||
public static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier";
|
||||
private static final String TAG = "KeyboardAndTouchA11yFragment";
|
||||
private static final Uri sVirtualKeyboardSettingsUri = Secure.getUriFor(
|
||||
Secure.SHOW_IME_WITH_HARD_KEYBOARD);
|
||||
@@ -112,13 +109,8 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
private TwoStatePreference mAccessibilityStickyKeys = null;
|
||||
@Nullable
|
||||
private TwoStatePreference mAccessibilityMouseKeys = null;
|
||||
|
||||
private Intent mIntentWaitingForResult;
|
||||
private boolean mSupportsFirmwareUpdate;
|
||||
|
||||
static final String EXTRA_BT_ADDRESS = "extra_bt_address";
|
||||
private String mBluetoothAddress;
|
||||
|
||||
@Override
|
||||
protected String getLogTag() {
|
||||
return TAG;
|
||||
@@ -197,8 +189,7 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
mKeyboardA11yCategory.setVisible(false);
|
||||
}
|
||||
InputDeviceIdentifier inputDeviceIdentifier = activity.getIntent().getParcelableExtra(
|
||||
KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER,
|
||||
InputDeviceIdentifier.class);
|
||||
EXTRA_INPUT_DEVICE_IDENTIFIER, InputDeviceIdentifier.class);
|
||||
int intentFromWhere =
|
||||
activity.getIntent().getIntExtra(android.provider.Settings.EXTRA_ENTRYPOINT, -1);
|
||||
if (intentFromWhere != -1) {
|
||||
@@ -360,13 +351,6 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
}
|
||||
}
|
||||
|
||||
private void showKeyboardLayoutDialog(InputDeviceIdentifier inputDeviceIdentifier) {
|
||||
KeyboardLayoutDialogFragment fragment = new KeyboardLayoutDialogFragment(
|
||||
inputDeviceIdentifier);
|
||||
fragment.setTargetFragment(this, 0);
|
||||
fragment.show(getActivity().getSupportFragmentManager(), "keyboardLayout");
|
||||
}
|
||||
|
||||
private void showEnabledLocalesKeyboardLayoutList(InputDeviceIdentifier inputDeviceIdentifier) {
|
||||
Bundle arguments = new Bundle();
|
||||
arguments.putParcelable(InputPeripheralsSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER,
|
||||
@@ -505,45 +489,6 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
public void onSetupKeyboardLayouts(InputDeviceIdentifier inputDeviceIdentifier) {
|
||||
final Intent intent = new Intent(Intent.ACTION_MAIN);
|
||||
intent.setClass(getActivity(), Settings.KeyboardLayoutPickerActivity.class);
|
||||
intent.putExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER,
|
||||
inputDeviceIdentifier);
|
||||
mIntentWaitingForResult = intent;
|
||||
startActivityForResult(intent, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
|
||||
if (mIntentWaitingForResult != null) {
|
||||
InputDeviceIdentifier inputDeviceIdentifier = mIntentWaitingForResult
|
||||
.getParcelableExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER,
|
||||
InputDeviceIdentifier.class);
|
||||
mIntentWaitingForResult = null;
|
||||
showKeyboardLayoutDialog(inputDeviceIdentifier);
|
||||
}
|
||||
}
|
||||
|
||||
private static String getLayoutLabel(@NonNull InputDevice device,
|
||||
@NonNull Context context, @NonNull InputManager im) {
|
||||
final String currentLayoutDesc =
|
||||
im.getCurrentKeyboardLayoutForInputDevice(device.getIdentifier());
|
||||
if (currentLayoutDesc == null) {
|
||||
return context.getString(R.string.keyboard_layout_default_label);
|
||||
}
|
||||
final KeyboardLayout currentLayout = im.getKeyboardLayout(currentLayoutDesc);
|
||||
if (currentLayout == null) {
|
||||
return context.getString(R.string.keyboard_layout_default_label);
|
||||
}
|
||||
// If current layout is specified but the layout is null, just return an empty string
|
||||
// instead of falling back to R.string.keyboard_layout_default_label.
|
||||
return TextUtils.emptyIfNull(currentLayout.getLabel());
|
||||
}
|
||||
|
||||
@NonNull
|
||||
static List<HardKeyboardDeviceInfo> getHardKeyboards(@NonNull Context context) {
|
||||
final List<HardKeyboardDeviceInfo> keyboards = new ArrayList<>();
|
||||
@@ -559,7 +504,6 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
keyboards.add(new HardKeyboardDeviceInfo(
|
||||
device.getName(),
|
||||
device.getIdentifier(),
|
||||
getLayoutLabel(device, context, im),
|
||||
device.getBluetoothAddress(),
|
||||
device.getVendorId(),
|
||||
device.getProductId()));
|
||||
@@ -572,12 +516,8 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
result = a.mDeviceIdentifier.getDescriptor().compareTo(
|
||||
return a.mDeviceIdentifier.getDescriptor().compareTo(
|
||||
b.mDeviceIdentifier.getDescriptor());
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
return collator.compare(a.mLayoutLabel, b.mLayoutLabel);
|
||||
});
|
||||
return keyboards;
|
||||
}
|
||||
@@ -587,8 +527,6 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
public final String mDeviceName;
|
||||
@NonNull
|
||||
public final InputDeviceIdentifier mDeviceIdentifier;
|
||||
@NonNull
|
||||
public final String mLayoutLabel;
|
||||
@Nullable
|
||||
public final String mBluetoothAddress;
|
||||
@NonNull
|
||||
@@ -599,13 +537,11 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
public HardKeyboardDeviceInfo(
|
||||
@Nullable String deviceName,
|
||||
@NonNull InputDeviceIdentifier deviceIdentifier,
|
||||
@NonNull String layoutLabel,
|
||||
@Nullable String bluetoothAddress,
|
||||
@NonNull int vendorId,
|
||||
@NonNull int productId) {
|
||||
mDeviceName = TextUtils.emptyIfNull(deviceName);
|
||||
mDeviceIdentifier = deviceIdentifier;
|
||||
mLayoutLabel = layoutLabel;
|
||||
mBluetoothAddress = bluetoothAddress;
|
||||
mVendorId = vendorId;
|
||||
mProductId = productId;
|
||||
@@ -625,9 +561,6 @@ public final class PhysicalKeyboardFragment extends DashboardFragment
|
||||
if (!Objects.equals(mDeviceIdentifier, that.mDeviceIdentifier)) {
|
||||
return false;
|
||||
}
|
||||
if (!TextUtils.equals(mLayoutLabel, that.mLayoutLabel)) {
|
||||
return false;
|
||||
}
|
||||
if (!TextUtils.equals(mBluetoothAddress, that.mBluetoothAddress)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user