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

Commit 96ab6364 authored by Jason Monk's avatar Jason Monk
Browse files

Battery graph in QS Detail 

Add new usage graph view to SettingsLib that shows usage with
same labels and whatnot.

Use that graph in the battery detail panel to show more stuffs.

Change-Id: I397b1314f65f668df566e93bdbc15420e1b3a280
parent 209fd91d

packages/SettingsLib/res/layout/usage_bottom_label.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<TextView

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:textAppearance="?android:attr/textAppearanceSmall" />

packages/SettingsLib/res/layout/usage_side_label.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<TextView

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:textAppearance="?android:attr/textAppearanceSmall" />

packages/SettingsLib/res/layout/usage_view.xml

0 → 100644
+86 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<LinearLayout

    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:layout_width="match_parent"

        android:layout_height="@dimen/usage_graph_area_height"

        android:orientation="horizontal"

        android:clipChildren="false"

        android:clipToPadding="false">



        <LinearLayout

            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"

                layout="@layout/usage_side_label" />



            <Space

                android:layout_width="wrap_content"

                android:layout_height="0dp"

                android:layout_weight="1" />



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

                layout="@layout/usage_side_label" />



            <Space

                android:layout_width="wrap_content"

                android:layout_height="0dp"

                android:layout_weight="1" />



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

                layout="@layout/usage_side_label" />



        </LinearLayout>



        <com.android.settingslib.graph.UsageGraph

            android:id="@+id/usage_graph"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:layout_marginTop="@dimen/usage_graph_margin_top_bottom"

            android:layout_marginBottom="@dimen/usage_graph_margin_top_bottom" />



    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="@dimen/usage_graph_labels_width"

        android:orientation="horizontal">



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

            layout="@layout/usage_side_label" />



        <Space

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1" />



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

            layout="@layout/usage_side_label" />



    </LinearLayout>



</LinearLayout>

packages/SettingsLib/res/values/attrs.xml

+7 −0
Original line number Diff line number Diff line
@@ -24,4 +24,11 @@ 
    </declare-styleable>

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



    <declare-styleable name="UsageView">

        <attr name="android:colorAccent" />

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

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

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

    </declare-styleable>



</resources>

packages/SettingsLib/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -16,4 +16,6 @@ 


<resources>

    <color name="disabled_text_color">#66000000</color> <!-- 38% black -->



    <color name="usage_graph_dots">#455A64</color>

</resources>