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

Commit 1c5d663e authored by jackqdyulei's avatar jackqdyulei Committed by Lei Yu
Browse files

Init the pref summary in onCreate() 

The visibility of bottom summary in BatteryHistoryPrefence will
be changed dynamically(charging status + flags). Before this cl,
we only update it in a callback, which makes other preference
may have unnecessary moves.

This cl add init method in onCreate(), which removes the uncessary
preference position moves.

Bug: 65529494
Test: RoboTest still pass
Change-Id: I09d2e26fc3caaeb272422997c16957770cdc1d3f
(cherry picked from commit 65dea0a7)
parent adef5b23

src/com/android/settings/fuelgauge/PowerUsageAdvanced.java

+9 −3
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        mPackageManager = context.getPackageManager();

        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);

        mBatteryUtils = BatteryUtils.getInstance(context);



        // init the summary so other preferences won't have unnecessary move

        updateHistPrefSummary(context);

    }



    @Override
@@ -175,7 +178,13 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        }

        updatePreference(mHistPref);

        refreshPowerUsageDataList(mStatsHelper, mUsageListGroup);

        updateHistPrefSummary(context);



        BatteryEntry.startRequestQueue();

        BatteryUtils.logRuntime(TAG, "refreshUI", startTime);

    }



    private void updateHistPrefSummary(Context context) {

        Intent batteryIntent =

                context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));

        final boolean plugged = batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) != 0;
@@ -186,9 +195,6 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        } else {

            mHistPref.hideBottomSummary();

        }



        BatteryEntry.startRequestQueue();

        BatteryUtils.logRuntime(TAG, "refreshUI", startTime);

    }



    @VisibleForTesting