Merge "Make action constants configurable." into tm-dev (696010b0) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+5 −3

Original line number	Diff line number	Diff line
		@@ -13831,9 +13831,11 @@
		<!-- Title for the various modifiers that alter the cost of TARE tasks based on battery status
		(charging, power save mode, etc.) [CHAR LIMIT=40]-->
		<string name="tare_modifiers">Modifiers</string>
		<!-- Title for the various TARE policy's action's cost to produce and price paid by
		apps [CHAR LIMIT=40]-->
		<string name="tare_actions">Actions</string>
		<!-- Title for the various TARE policy's actions' cost to produce. "Cost to produce" refers to
		how many credits it costs the system to perform (produce) the action. [CHAR LIMIT=40]-->
		<string name="tare_actions_ctp">Actions (Cost to Produce)</string>
		<!-- Title for the various TARE policy's actions' starting prices [CHAR LIMIT=40]-->
		<string name="tare_actions_base_price">Actions (Base Price)</string>
		<!-- Title for the instant, ongoing, and max rewards apps can obtain for different actions that
		benefit the user. [CHAR LIMIT=40]-->
		<string name="tare_rewards">Rewards</string>

src/com/android/settings/development/tare/AlarmManagerFragment.java

+29 −3

Original line number	Diff line number	Diff line
		@@ -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
		},
		// {},
		};
		}

src/com/android/settings/development/tare/JobSchedulerFragment.java

+30 −3

Original line number	Diff line number	Diff line
		@@ -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
		},
		// {},
		};
		}