From 6525ff3d792e6e2a806f453570aacd057cf1cc14 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Fri, 18 Mar 2022 18:53:03 +0000 Subject: [PATCH] Make action constants configurable. Make it possible to configure the base price and cost to produce of all supported actions. Bug: 158300259 Bug: 189850067 Bug: 191876714 Bug: 191877052 Test: Manual Change-Id: I2dcd3382f7404655fb0d10538a426071c157ea18 --- res/values/strings.xml | 8 +++-- .../tare/AlarmManagerFragment.java | 32 ++++++++++++++++-- .../tare/JobSchedulerFragment.java | 33 +++++++++++++++++-- 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index cd5f71aafae..3a32dada0da 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13831,9 +13831,11 @@ Modifiers - - Actions + + Actions (Cost to Produce) + + Actions (Base Price) Rewards diff --git a/src/com/android/settings/development/tare/AlarmManagerFragment.java b/src/com/android/settings/development/tare/AlarmManagerFragment.java index fe76b1287b3..c4dca376ae1 100644 --- a/src/com/android/settings/development/tare/AlarmManagerFragment.java +++ b/src/com/android/settings/development/tare/AlarmManagerFragment.java @@ -95,7 +95,8 @@ public class AlarmManagerFragment extends Fragment implements resources.getString(R.string.tare_consumption_limits), resources.getString(R.string.tare_balances), // resources.getString(R.string.tare_modifiers), - // resources.getString(R.string.tare_actions), + resources.getString(R.string.tare_actions_ctp), + resources.getString(R.string.tare_actions_base_price), // resources.getString(R.string.tare_rewards) }; @@ -104,7 +105,8 @@ public class AlarmManagerFragment extends Fragment implements resources.getStringArray(R.array.tare_app_balance_subfactors), // TODO: support // resources.getStringArray(R.array.tare_modifiers_subfactors), - // resources.getStringArray(R.array.tare_alarm_manager_actions), + resources.getStringArray(R.array.tare_alarm_manager_actions), + resources.getStringArray(R.array.tare_alarm_manager_actions), // resources.getStringArray(R.array.tare_rewards_subfactors) }; @@ -120,7 +122,31 @@ public class AlarmManagerFragment extends Fragment implements EconomyManager.KEY_AM_MIN_SATIATED_BALANCE_OTHER_APP }, // {}, - // {}, + { + EconomyManager.KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_CTP, + EconomyManager.KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_CTP, + EconomyManager.KEY_AM_ACTION_ALARM_EXACT_WAKEUP_CTP, + EconomyManager.KEY_AM_ACTION_ALARM_INEXACT_WAKEUP_CTP, + EconomyManager.KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_CTP, + EconomyManager.KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_CTP, + EconomyManager.KEY_AM_ACTION_ALARM_EXACT_NONWAKEUP_CTP, + EconomyManager.KEY_AM_ACTION_ALARM_INEXACT_NONWAKEUP_CTP, + EconomyManager.KEY_AM_ACTION_ALARM_ALARMCLOCK_CTP + }, + { + EconomyManager.KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_BASE_PRICE, + EconomyManager + .KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_BASE_PRICE, + EconomyManager.KEY_AM_ACTION_ALARM_EXACT_WAKEUP_BASE_PRICE, + EconomyManager.KEY_AM_ACTION_ALARM_INEXACT_WAKEUP_BASE_PRICE, + EconomyManager + .KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_BASE_PRICE, + EconomyManager + .KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE, + EconomyManager.KEY_AM_ACTION_ALARM_EXACT_NONWAKEUP_BASE_PRICE, + EconomyManager.KEY_AM_ACTION_ALARM_INEXACT_NONWAKEUP_BASE_PRICE, + EconomyManager.KEY_AM_ACTION_ALARM_ALARMCLOCK_BASE_PRICE + }, // {}, }; } diff --git a/src/com/android/settings/development/tare/JobSchedulerFragment.java b/src/com/android/settings/development/tare/JobSchedulerFragment.java index 1c6598c9a47..275e012e941 100644 --- a/src/com/android/settings/development/tare/JobSchedulerFragment.java +++ b/src/com/android/settings/development/tare/JobSchedulerFragment.java @@ -96,7 +96,8 @@ public class JobSchedulerFragment extends Fragment implements resources.getString(R.string.tare_consumption_limits), resources.getString(R.string.tare_balances), // mResources.getString(R.string.tare_modifiers), - // mResources.getString(R.string.tare_actions), + resources.getString(R.string.tare_actions_ctp), + resources.getString(R.string.tare_actions_base_price), // mResources.getString(R.string.tare_rewards) }; @@ -105,7 +106,8 @@ public class JobSchedulerFragment extends Fragment implements resources.getStringArray(R.array.tare_app_balance_subfactors), // TODO: support // mResources.getStringArray(R.array.tare_modifiers_subfactors), - // mResources.getStringArray(R.array.tare_job_scheduler_actions), + resources.getStringArray(R.array.tare_job_scheduler_actions), + resources.getStringArray(R.array.tare_job_scheduler_actions), // mResources.getStringArray(R.array.tare_rewards_subfactors) }; @@ -121,7 +123,32 @@ public class JobSchedulerFragment extends Fragment implements EconomyManager.KEY_JS_MIN_SATIATED_BALANCE_OTHER_APP }, // {}, - // {}, + { + EconomyManager.KEY_JS_ACTION_JOB_MAX_START_CTP, + EconomyManager.KEY_JS_ACTION_JOB_MAX_RUNNING_CTP, + EconomyManager.KEY_JS_ACTION_JOB_HIGH_START_CTP, + EconomyManager.KEY_JS_ACTION_JOB_HIGH_RUNNING_CTP, + EconomyManager.KEY_JS_ACTION_JOB_DEFAULT_START_CTP, + EconomyManager.KEY_JS_ACTION_JOB_DEFAULT_RUNNING_CTP, + EconomyManager.KEY_JS_ACTION_JOB_LOW_START_CTP, + EconomyManager.KEY_JS_ACTION_JOB_LOW_RUNNING_CTP, + EconomyManager.KEY_JS_ACTION_JOB_MIN_START_CTP, + EconomyManager.KEY_JS_ACTION_JOB_MIN_RUNNING_CTP, + EconomyManager.KEY_JS_ACTION_JOB_TIMEOUT_PENALTY_CTP + }, + { + EconomyManager.KEY_JS_ACTION_JOB_MAX_START_BASE_PRICE, + EconomyManager.KEY_JS_ACTION_JOB_MAX_RUNNING_BASE_PRICE, + EconomyManager.KEY_JS_ACTION_JOB_HIGH_START_BASE_PRICE, + EconomyManager.KEY_JS_ACTION_JOB_HIGH_RUNNING_BASE_PRICE, + EconomyManager.KEY_JS_ACTION_JOB_DEFAULT_START_BASE_PRICE, + EconomyManager.KEY_JS_ACTION_JOB_DEFAULT_RUNNING_BASE_PRICE, + EconomyManager.KEY_JS_ACTION_JOB_LOW_START_BASE_PRICE, + EconomyManager.KEY_JS_ACTION_JOB_LOW_RUNNING_BASE_PRICE, + EconomyManager.KEY_JS_ACTION_JOB_MIN_START_BASE_PRICE, + EconomyManager.KEY_JS_ACTION_JOB_MIN_RUNNING_BASE_PRICE, + EconomyManager.KEY_JS_ACTION_JOB_TIMEOUT_PENALTY_BASE_PRICE + }, // {}, }; }