diff --git a/res/values/strings.xml b/res/values/strings.xml index 8bdf8bd74d5..fca185d6d06 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12012,6 +12012,8 @@ Inexact NonWakeup Alarm AlarmClock + + App Install Top Activity @@ -12126,6 +12128,16 @@ @string/tare_widget_interaction @string/tare_other_interaction + + + @string/tare_top_activity + @string/tare_notification_seen + @string/tare_notification_interaction + @string/tare_widget_interaction + @string/tare_other_interaction + @string/tare_app_install + diff --git a/src/com/android/settings/development/tare/JobSchedulerFragment.java b/src/com/android/settings/development/tare/JobSchedulerFragment.java index 4c5fcc69724..ddcb6ee6f2b 100644 --- a/src/com/android/settings/development/tare/JobSchedulerFragment.java +++ b/src/com/android/settings/development/tare/JobSchedulerFragment.java @@ -110,9 +110,9 @@ public class JobSchedulerFragment extends Fragment implements // mResources.getStringArray(R.array.tare_modifiers_subfactors), resources.getStringArray(R.array.tare_job_scheduler_actions), resources.getStringArray(R.array.tare_job_scheduler_actions), - resources.getStringArray(R.array.tare_rewards_subfactors), + resources.getStringArray(R.array.tare_job_scheduler_rewards_subfactors), {resources.getString(R.string.tare_top_activity)}, - resources.getStringArray(R.array.tare_rewards_subfactors) + resources.getStringArray(R.array.tare_job_scheduler_rewards_subfactors) }; mKeys = new String[][]{ @@ -159,6 +159,7 @@ public class JobSchedulerFragment extends Fragment implements EconomyManager.KEY_JS_REWARD_NOTIFICATION_INTERACTION_INSTANT, EconomyManager.KEY_JS_REWARD_WIDGET_INTERACTION_INSTANT, EconomyManager.KEY_JS_REWARD_OTHER_USER_INTERACTION_INSTANT, + EconomyManager.KEY_JS_REWARD_APP_INSTALL_INSTANT, }, {EconomyManager.KEY_JS_REWARD_TOP_ACTIVITY_ONGOING}, { @@ -167,6 +168,7 @@ public class JobSchedulerFragment extends Fragment implements EconomyManager.KEY_JS_REWARD_NOTIFICATION_INTERACTION_MAX, EconomyManager.KEY_JS_REWARD_WIDGET_INTERACTION_MAX, EconomyManager.KEY_JS_REWARD_OTHER_USER_INTERACTION_MAX, + EconomyManager.KEY_JS_REWARD_APP_INSTALL_MAX, } }; } diff --git a/src/com/android/settings/development/tare/TareFactorController.java b/src/com/android/settings/development/tare/TareFactorController.java index 57723927510..7e45248a7b6 100644 --- a/src/com/android/settings/development/tare/TareFactorController.java +++ b/src/com/android/settings/development/tare/TareFactorController.java @@ -305,6 +305,18 @@ public class TareFactorController { new TareFactorData(mResources.getString(R.string.tare_hard_consumption_limit), EconomyManager.DEFAULT_JS_HARD_CONSUMPTION_LIMIT_CAKES, POLICY_JOB_SCHEDULER)); + mJobSchedulerMap.put(EconomyManager.KEY_JS_REWARD_APP_INSTALL_INSTANT, + new TareFactorData(mResources.getString(R.string.tare_app_install), + EconomyManager.DEFAULT_JS_REWARD_APP_INSTALL_INSTANT_CAKES, + POLICY_JOB_SCHEDULER)); + mJobSchedulerMap.put(EconomyManager.KEY_JS_REWARD_APP_INSTALL_ONGOING, + new TareFactorData(mResources.getString(R.string.tare_app_install), + EconomyManager.DEFAULT_JS_REWARD_APP_INSTALL_ONGOING_CAKES, + POLICY_JOB_SCHEDULER)); + mJobSchedulerMap.put(EconomyManager.KEY_JS_REWARD_APP_INSTALL_MAX, + new TareFactorData(mResources.getString(R.string.tare_app_install), + EconomyManager.DEFAULT_JS_REWARD_APP_INSTALL_MAX_CAKES, + POLICY_JOB_SCHEDULER)); mJobSchedulerMap.put(EconomyManager.KEY_JS_REWARD_TOP_ACTIVITY_INSTANT, new TareFactorData(mResources.getString(R.string.tare_top_activity), EconomyManager.DEFAULT_JS_REWARD_TOP_ACTIVITY_INSTANT_CAKES,