Merge "Update battery content description." into qt-dev

    <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_level">Battery <xliff:g id="number">%d</xliff:g> percent.</string>

    <!-- Content description of the battery level icon for accessibility, including the estimated time remaining before the phone runs out of battery (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_level_with_estimate">Battery <xliff:g id="percentage" example="95%">%1$s</xliff:g> percent, about <xliff:g id="time" example="Until 3:15pm">%2$s</xliff:g> left based on your usage</string>

    <!-- Content description of the battery level icon for accessibility while the device is charging (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_level_charging">Battery charging, <xliff:g id="battery_percentage">%d</xliff:g> percent.</string>

                    if (estimate != null) {

                        mBatteryPercentView.setText(estimate);

                        setContentDescription(getContext().getString(

                                R.string.battery_low_percent_format_hybrid, mLevel, estimate));

                                R.string.accessibility_battery_level_with_estimate,

                                mLevel, estimate));

                    } else {

                        setPercentTextAtCurrentLevel();

                    }