PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make action constants configurable." into tm-dev am: 696010b0c5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260256

Change-Id: I1910a7aa9c45398184800f542372685492fc28a8
This commit is contained in:
Kweku Adams
2022-03-18 22:17:01 +00:00
committed by Automerger Merge Worker
parent 74c4655027 696010b0c5
commit 6ff3a5e686
3 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/development/tare/AlarmManagerFragment.java
View File

@@ -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
},
// {},
};
}

33
src/com/android/settings/development/tare/JobSchedulerFragment.java
View File

@@ -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
},
// {},
};
}