diff options
Diffstat (limited to 'src')
4 files changed, 23 insertions, 6 deletions
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index c926da38a7..467b42e139 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -178,7 +178,9 @@ public class AppStorageSettings extends AppInfoWithHeader mChangeStorageButton.setOnClickListener(this); // Cache section - mButtonsPref.setButton2Text(R.string.clear_cache_btn_text); + mButtonsPref + .setButton2Text(R.string.clear_cache_btn_text) + .setButton2Icon(R.drawable.ic_settings_delete); // URI permissions section mUri = (PreferenceCategory) findPreference(KEY_URI_CATEGORY); @@ -304,16 +306,20 @@ public class AppStorageSettings extends AppInfoWithHeader || !isManageSpaceActivityAvailable) { mButtonsPref .setButton1Text(R.string.clear_user_data_text) + .setButton1Icon(R.drawable.ic_settings_delete) .setButton1Enabled(false); mCanClearData = false; } else { if (appHasSpaceManagementUI) { mButtonsPref.setButton1Text(R.string.manage_space_text); } else { - mButtonsPref.setButton1Text(R.string.clear_user_data_text); + mButtonsPref + .setButton1Text(R.string.clear_user_data_text) + .setButton1Icon(R.drawable.ic_settings_delete); } mButtonsPref .setButton1Text(R.string.clear_user_data_text) + .setButton1Icon(R.drawable.ic_settings_delete) .setButton1OnClickListener(v -> handleClearDataClick()); } @@ -384,7 +390,9 @@ public class AppStorageSettings extends AppInfoWithHeader private void processClearMsg(Message msg) { int result = msg.arg1; String packageName = mAppEntry.info.packageName; - mButtonsPref.setButton1Text(R.string.clear_user_data_text); + mButtonsPref + .setButton1Text(R.string.clear_user_data_text) + .setButton1Icon(R.drawable.ic_settings_delete); if (result == OP_SUCCESSFUL) { Log.i(TAG, "Cleared user data for package : " + packageName); updateSize(); diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java index 12c4d9d7f2..b7023bb01e 100644 --- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java @@ -165,7 +165,9 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp if (isAvailable()) { mButtonsPref = ((ActionButtonPreference) screen.findPreference(KEY_ACTION_BUTTONS)) .setButton1Text(R.string.uninstall_text) + .setButton1Icon(R.drawable.ic_settings_delete) .setButton2Text(R.string.force_stop) + .setButton2Icon(R.drawable.ic_settings_force_stop) .setButton1OnClickListener(new UninstallAndDisableButtonListener()) .setButton2OnClickListener(new ForceStopButtonListener()) .setButton1Positive(false) @@ -541,15 +543,18 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp if (mHomePackages.contains(mAppEntry.info.packageName) || isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) { // Disable button for core system applications. - mButtonsPref.setButton1Text(R.string.disable_text) + mButtonsPref.setButton1Text(R.string.uninstall_text) + .setButton1Icon(R.drawable.ic_settings_delete) .setButton1Positive(false); } else if (mAppEntry.info.enabled && !isDisabledUntilUsed()) { - mButtonsPref.setButton1Text(R.string.disable_text) + mButtonsPref.setButton1Text(R.string.uninstall_text) + .setButton1Icon(R.drawable.ic_settings_delete) .setButton1Positive(false); disableable = !mApplicationFeatureProvider.getKeepEnabledPackages() .contains(mAppEntry.info.packageName); } else { - mButtonsPref.setButton1Text(R.string.enable_text) + mButtonsPref.setButton1Text(R.string.install_text) + .setButton1Icon(R.drawable.ic_settings_install) .setButton1Positive(true); disableable = true; } 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); diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index 46f485c9ba..ea31b1b24c 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -278,6 +278,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController mButtonsPref = ((ActionButtonPreference) screen.findPreference(KEY_BUTTONS_PREF)) .setButton1Text(R.string.forget) + .setButton1Icon(R.drawable.ic_settings_delete) .setButton1Positive(false) .setButton1OnClickListener(view -> forgetNetwork()) .setButton2Text(R.string.wifi_sign_in_button_text) |