Merge "Fixes and changes to support settings using UsageView" into nyc-dev

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingEnd="@dimen/usage_graph_padding_end"

    android:orientation="vertical">

    <LinearLayout

        android:id="@+id/graph_label_group"

        android:layout_width="match_parent"

        android:layout_height="@dimen/usage_graph_area_height"

        android:orientation="horizontal"

        android:clipToPadding="false">

        <LinearLayout

            android:id="@+id/label_group"

            android:layout_width="@dimen/usage_graph_labels_width"

            android:layout_height="match_parent"

            android:paddingStart="@dimen/usage_graph_labels_padding"

            android:orientation="vertical">

            <include android:id="@+id/label_top"

    </LinearLayout>

    <LinearLayout

        android:id="@+id/bottom_label_group"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="@dimen/usage_graph_labels_width"

        <attr name="sideLabels" format="reference" />

        <attr name="bottomLabels" format="reference" />

        <attr name="textColor" format="color" />

        <attr name="android:gravity" />

    </declare-styleable>

</resources>

    <!-- Usage graph dimens -->

    <dimen name="usage_graph_area_height">122dp</dimen>

    <dimen name="usage_graph_margin_top_bottom">9dp</dimen>

    <dimen name="usage_graph_padding_end">24dp</dimen>

    <dimen name="usage_graph_labels_width">72dp</dimen>

    <dimen name="usage_graph_labels_width">56dp</dimen>

    <dimen name="usage_graph_labels_padding">16dp</dimen>

    <dimen name="usage_graph_divider_size">1dp</dimen>

    <string name="daltonizer_type_overridden">Overridden by <xliff:g id="title" example="Simulate color space">%1$s</xliff:g></string>

    <!-- [CHAR_LIMIT=40] Label for estimated remaining duration of battery charging/discharging -->

    <string name="power_remaining_duration_only">Approx. <xliff:g id="time">%2$s</xliff:g> left</string>

    <string name="power_remaining_duration_only">Approx. <xliff:g id="time">%1$s</xliff:g> left</string>

    <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->

    <string name="power_discharging_duration"><xliff:g id="level">%1$s</xliff:g>

        String remaining = "";

        if (remainingTimeUs != 0) {

            remaining = context.getString(R.string.remaining_length_format,

                    Formatter.formatShortElapsedTime(context, remainingTimeUs));

                    Formatter.formatShortElapsedTime(context, remainingTimeUs / 1000));

        }

        view.setBottomLabels(new CharSequence[] { timeString, remaining});