diff options
| author | tmfang <tmfang@google.com> | 2018-11-09 20:21:14 +0800 |
|---|---|---|
| committer | tmfang <tmfang@google.com> | 2018-11-16 14:33:03 +0800 |
| commit | 3adb74ea60a0553acb7337177afb3896d3fbcf25 (patch) | |
| tree | a102e6498ff22a2d55ca0e59aaf6c5bbf3e8583f /src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java | |
| parent | 8f65efa8f92528c6f259e34f5aed2ae692efb16e (diff) | |
| download | packages_apps_Settings-3adb74ea60a0553acb7337177afb3896d3fbcf25.tar.gz packages_apps_Settings-3adb74ea60a0553acb7337177afb3896d3fbcf25.tar.bz2 packages_apps_Settings-3adb74ea60a0553acb7337177afb3896d3fbcf25.zip | |
Apply new action button visual design
- Add some icon resources.
- Add icon for each button in action button preference.
- Update "Enable" and "Disable" string to "Install" and "uninstall".
- Remove unused string.
- Add divider between entity header and action buttons.
Test: visual, robotest
Fixes: 119203074
Bug: 116346008
Change-Id: Ib8d7aeb2943d39d257e977b84f165f002bf47559
Diffstat (limited to 'src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java')
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java index 09632df155..ac90870cf8 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java @@ -53,6 +53,7 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle protected void init(PreferenceScreen screen) { mActionButtons = ((ActionButtonPreference) screen.findPreference(getPreferenceKey())) .setButton1Text(R.string.forget) + .setButton1Icon(R.drawable.ic_settings_delete) .setButton1OnClickListener((view) -> onForgetButtonPressed()) .setButton1Positive(false) .setButton1Enabled(true); @@ -68,6 +69,7 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle if (!mConnectButtonInitialized || !previouslyConnected) { mActionButtons .setButton2Text(R.string.bluetooth_device_context_disconnect) + .setButton2Icon(R.drawable.ic_settings_close) .setButton2OnClickListener(view -> mCachedDevice.disconnect()) .setButton2Positive(false); mConnectButtonInitialized = true; @@ -76,6 +78,7 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle if (!mConnectButtonInitialized || previouslyConnected) { mActionButtons .setButton2Text(R.string.bluetooth_device_context_connect) + // TODO (b/119646923) Icon is not ready. .setButton2OnClickListener( view -> mCachedDevice.connect(true /* connectAllProfiles */)) .setButton2Positive(true); |