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

Commit 8a2f809f authored by c_pengz's avatar c_pengz Committed by Linux Build Service Account
Browse files

Settings: Data usage based on Day/Week. 

    Add data sweep UI logical.

CRs-Fixed: 828015

Change-Id: I297b87925c91d4b681428942b234d1f61509dc54
parent 8a337681

res/layout/data_usage_chart.xml

+22 −0
Original line number Diff line number Diff line
@@ -57,6 +57,28 @@ 
        settings:fillColorSecondary="?android:attr/colorAccent"

        settings:safeRegion="3dp" />



    <com.android.settings.widget.ChartSweepView

        android:id="@+id/sweep_left"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        settings:sweepDrawable="@drawable/data_sweep_left"

        settings:followAxis="horizontal"

        settings:neighborMargin="5dip"

        settings:strokeColor="#00000000"

        settings:fillColor="?android:attr/colorAccent"

        settings:fillColorSecondary="?android:attr/colorAccent" />



    <com.android.settings.widget.ChartSweepView

        android:id="@+id/sweep_right"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        settings:sweepDrawable="@drawable/data_sweep_right"

        settings:followAxis="horizontal"

        settings:neighborMargin="5dip"

        settings:strokeColor="#00000000"

        settings:fillColor="?android:attr/colorAccent"

        settings:fillColorSecondary="?android:attr/colorAccent" />



    <com.android.settings.widget.ChartSweepView

        android:id="@+id/sweep_warning"

        android:layout_width="match_parent"

res/values-zh-rCN/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -3115,4 +3115,5 @@ 
    <string name="notify_connect_summary">连接到CMCC热点后提示</string>

    <string name="wifi_setting_connect_type_error">设置自动连接类型时出现错误。</string>

    <string name="label_global_roaming_settings">国际漫游设置</string>

    <string name="set_data_time_range">显示时间区间</string>

</resources>

res/values/bools.xml

+3 −0
Original line number Diff line number Diff line
@@ -71,4 +71,7 @@ 


    <!-- Whether to hide wifi hotspot -->

    <bool name="hide_wifi_hotspot">false</bool>



    <!-- Whether to enable data usage selection -->

    <bool name="config_data_usage_selection">false</bool>

</resources>

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -7514,7 +7514,7 @@ 
    <string name="notify_connect">CMCC WLAN prompt</string>

    <string name="notify_connect_summary">Prompt me when access to CMCC WLAN</string>

    <string name="wifi_setting_connect_type_error">There was a problem setting the connect type.</string>















    <!-- Roaming Data Settings -->















    <string name="label_global_roaming_settings">Roaming Settings</string>













    <string name="set_data_time_range">Show time range</string>















</resources>

























res/xml/billing_cycle.xml
100644 → 100755



+4
−0




























Original line number
Diff line number
Diff line








@@ -33,4 +33,8 @@













        android:key="data_limit"















        android:title="@string/data_limit" />





























    <SwitchPreference













        android:key="set_data_time_range"













        android:title="@string/set_data_time_range" />





























</PreferenceScreen>