Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edbd62b8 authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

Merge "Update constant names." into tm-dev am: 01ad893e 

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

Change-Id: I7e59aefcde83e5cf119c895b48c3f64c2df7e30e
parents f3b9f17c 01ad893e

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

+4 −4
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ public class TareFactorController { 
                new TareFactorData(mResources.getString(R.string.tare_max_satiated_balance),

                        EconomyManager.DEFAULT_AM_MAX_SATIATED_BALANCE,

                        POLICY_ALARM_MANAGER));

        mAlarmManagerMap.put(EconomyManager.KEY_AM_MAX_CIRCULATION,

        mAlarmManagerMap.put(EconomyManager.KEY_AM_INITIAL_CONSUMPTION_LIMIT,

                new TareFactorData(mResources.getString(R.string.tare_max_circulation),

                        EconomyManager.DEFAULT_AM_MAX_CIRCULATION,

                        EconomyManager.DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT,

                        POLICY_ALARM_MANAGER));

        mAlarmManagerMap.put(EconomyManager.KEY_AM_REWARD_TOP_ACTIVITY_INSTANT,

                new TareFactorData(mResources.getString(R.string.tare_top_activity),
@@ -265,9 +265,9 @@ public class TareFactorController { 
                new TareFactorData(mResources.getString(R.string.tare_max_satiated_balance),

                        EconomyManager.DEFAULT_JS_MAX_SATIATED_BALANCE,

                        POLICY_JOB_SCHEDULER));

        mJobSchedulerMap.put(EconomyManager.KEY_JS_MAX_CIRCULATION,

        mJobSchedulerMap.put(EconomyManager.KEY_JS_INITIAL_CONSUMPTION_LIMIT,

                new TareFactorData(mResources.getString(R.string.tare_max_circulation),

                        EconomyManager.DEFAULT_JS_MAX_CIRCULATION,

                        EconomyManager.DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT,

                        POLICY_JOB_SCHEDULER));

        mJobSchedulerMap.put(EconomyManager.KEY_JS_REWARD_TOP_ACTIVITY_INSTANT,

                new TareFactorData(mResources.getString(R.string.tare_top_activity),