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

Commit 9515a685 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Hide app usage time in high usage dialog" into qt-dev

parents 96b53495 2f90dd78

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -5329,11 +5329,11 @@ 
    <!-- Summary for the battery high usage tip, which presents battery may run out earlier [CHAR LIMIT=NONE] -->

    <string name="battery_tip_high_usage_summary">Battery may run out earlier than usual</string>

    <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->

    <string name="battery_tip_dialog_message" product="default">Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nMost used apps since full charge:</string>

    <string name="battery_tip_dialog_message" product="default">Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:</string>

    <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->

    <string name="battery_tip_dialog_message" product="tablet">Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nMost used apps since full charge:</string>

    <string name="battery_tip_dialog_message" product="tablet">Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:</string>

    <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->

    <string name="battery_tip_dialog_message" product="device">Your device has been used more than usual. Your battery may run out sooner than expected.\n\nMost used apps since full charge:</string>

    <string name="battery_tip_dialog_message" product="device">Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:</string>

    <!-- Footer message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->

    <string name="battery_tip_dialog_message_footer">Includes high-power background activity</string>

    <!-- Title for restricted app preference, showing how many app need to be restricted [CHAR LIMIT=NONE] -->

src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java

+0 −3
Original line number Diff line number Diff line
@@ -79,9 +79,6 @@ public class HighUsageAdapter extends RecyclerView.Adapter<HighUsageAdapter.View 
                Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager, app.packageName,

                        UserHandle.getUserId(app.uid)));

        holder.appName.setText(Utils.getApplicationLabel(mContext, app.packageName));

        if (app.screenOnTimeMs != 0) {

            holder.appTime.setText(StringUtil.formatElapsedTime(mContext, app.screenOnTimeMs, false));

        }

    }



    @Override