diff --git a/res/values/strings.xml b/res/values/strings.xml index 8c0a31bd62f..7bf09cdc026 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11751,6 +11751,10 @@ Balance is the same meaning as having money in a bank account. Remaining apps are those apps that don't fit into predefined categories. [CHAR LIMIT=80]--> Minimum Satiated Balance (Remaining Apps) + + Minimum Satiated Balance Addition (App Updaters) @@ -11759,6 +11763,15 @@ @string/tare_min_balance_headless_app @string/tare_min_balance_other_app + + + @string/tare_max_satiated_balance + @string/tare_min_balance_exempted + @string/tare_min_balance_headless_app + @string/tare_min_balance_other_app + @string/tare_min_balance_addition_app_updater + diff --git a/src/com/android/settings/development/tare/JobSchedulerFragment.java b/src/com/android/settings/development/tare/JobSchedulerFragment.java index ddcb6ee6f2b..9b8fb47dc99 100644 --- a/src/com/android/settings/development/tare/JobSchedulerFragment.java +++ b/src/com/android/settings/development/tare/JobSchedulerFragment.java @@ -105,7 +105,7 @@ public class JobSchedulerFragment extends Fragment implements mChildren = new String[][]{ resources.getStringArray(R.array.tare_consumption_limit_subfactors), - resources.getStringArray(R.array.tare_app_balance_subfactors), + resources.getStringArray(R.array.tare_job_scheduler_app_balance_subfactors), // TODO: support // mResources.getStringArray(R.array.tare_modifiers_subfactors), resources.getStringArray(R.array.tare_job_scheduler_actions), @@ -124,7 +124,8 @@ public class JobSchedulerFragment extends Fragment implements EconomyManager.KEY_JS_MAX_SATIATED_BALANCE, EconomyManager.KEY_JS_MIN_SATIATED_BALANCE_EXEMPTED, EconomyManager.KEY_JS_MIN_SATIATED_BALANCE_HEADLESS_SYSTEM_APP, - EconomyManager.KEY_JS_MIN_SATIATED_BALANCE_OTHER_APP + EconomyManager.KEY_JS_MIN_SATIATED_BALANCE_OTHER_APP, + EconomyManager.KEY_JS_MIN_SATIATED_BALANCE_INCREMENT_APP_UPDATER, }, // {}, { diff --git a/src/com/android/settings/development/tare/TareFactorController.java b/src/com/android/settings/development/tare/TareFactorController.java index 7e45248a7b6..e6c2d8c878d 100644 --- a/src/com/android/settings/development/tare/TareFactorController.java +++ b/src/com/android/settings/development/tare/TareFactorController.java @@ -293,6 +293,11 @@ public class TareFactorController { new TareFactorData(mResources.getString(R.string.tare_min_balance_other_app), EconomyManager.DEFAULT_JS_MIN_SATIATED_BALANCE_OTHER_APP_CAKES, POLICY_JOB_SCHEDULER)); + mJobSchedulerMap.put(EconomyManager.KEY_JS_MIN_SATIATED_BALANCE_INCREMENT_APP_UPDATER, + new TareFactorData( + mResources.getString(R.string.tare_min_balance_addition_app_updater), + EconomyManager.DEFAULT_JS_MIN_SATIATED_BALANCE_INCREMENT_APP_UPDATER_CAKES, + POLICY_JOB_SCHEDULER)); mJobSchedulerMap.put(EconomyManager.KEY_JS_MAX_SATIATED_BALANCE, new TareFactorData(mResources.getString(R.string.tare_max_satiated_balance), EconomyManager.DEFAULT_JS_MAX_SATIATED_BALANCE_CAKES,