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

Commit c661098a authored by Alex Kulesza's avatar Alex Kulesza
Browse files

Move UsageGraph from SettingsLib to Settings. 

In preparation for modifying the graph code to show detailed projections
(see bug), this change moves it into Settings along with related tests
and resources.

Bug: 38400320
Test: manual, make SettingsUnitTests, make SettingsGoogleUnitTests
Change-Id: I88e5336c15827727b3427e29b10954bba9cfba7d
parent fe23da57

res/layout/battery_history_detail.xml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textColor="?android:attr/textColorSecondary"/>



            <com.android.settingslib.graph.UsageView

            <com.android.settings.graph.UsageView

                android:id="@+id/battery_usage"

                android:layout_width="match_parent"

                android:layout_height="141dp"

res/layout/battery_usage_graph.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        android:textSize="36sp"

        android:textColor="?android:attr/colorAccent" />



    <com.android.settingslib.graph.UsageView

    <com.android.settings.graph.UsageView

        android:id="@+id/battery_usage"

        android:layout_width="match_parent"

        android:layout_height="141dp"

res/layout/data_usage_graph.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:orientation="vertical">



    <com.android.settingslib.graph.UsageView

    <com.android.settings.graph.UsageView

        android:id="@+id/data_usage"

        android:layout_width="match_parent"

        android:layout_height="@dimen/data_usage_chart_height"

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" />

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" />