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

Commit f6f32d80 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refine data usage chart in SIMs settings" into main

parents 7413b562 55f4697e

res/layout/data_usage_summary_preference.xml

+9 −3
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="172dp"

    android:paddingTop="8dp"

    android:paddingBottom="16dp"

    android:minHeight="146dp"

    android:paddingTop="0dp"

    android:paddingBottom="0dp"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:orientation="vertical"
@@ -38,6 +38,8 @@ 
        android:id="@+id/usage_layout"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="8dp"

        android:paddingEnd="8dp"

        android:orientation="horizontal">



        <TextView android:id="@+id/data_usage_view"
@@ -74,6 +76,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="4dp"

        android:paddingStart="8dp"

        android:paddingEnd="8dp"

        android:orientation="horizontal">



        <TextView android:id="@android:id/text1"
@@ -99,6 +103,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="12dp"

        android:paddingStart="8dp"

        android:paddingEnd="8dp"

        android:minHeight="54dp"

        android:orientation="vertical">

res/xml/mobile_network_settings.xml

+5 −5
Original line number Diff line number Diff line
@@ -22,16 +22,16 @@ 
        android:key="use_sim_switch"

        settings:controller="com.android.settings.network.telephony.MobileNetworkSwitchController"/>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="enabled_state_container"

        android:title="@string/summary_placeholder"

        settings:controller="com.android.settings.network.telephony.DisabledSubscriptionController">



    <com.android.settings.datausage.DataUsageSummaryPreference

        android:key="status_header"

        android:visibility="gone"

        android:selectable="false"/>



    <com.android.settingslib.widget.SettingsTitlelessPreferenceCategory

        android:key="enabled_state_container"

        android:title="@string/summary_placeholder"

        settings:controller="com.android.settings.network.telephony.DisabledSubscriptionController">



        <ListPreference

            android:key="calls_preference"

            android:title="@string/calls_preference"

src/com/android/settings/datausage/DataUsageSummaryPreference.java

+2 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.settings.datausage.lib.DataUsageFormatter; 
import com.android.settingslib.Utils;

import com.android.settingslib.spaprivileged.framework.common.BytesFormatter;

import com.android.settingslib.utils.StringUtil;

import com.android.settingslib.widget.GroupSectionDividerMixin;



import java.util.HashMap;

import java.util.Locale;
@@ -52,7 +53,7 @@ import java.util.concurrent.TimeUnit; 
/**

 * Provides a summary of data usage.

 */

public class DataUsageSummaryPreference extends Preference {

public class DataUsageSummaryPreference extends Preference implements GroupSectionDividerMixin {

    private static final long MILLIS_IN_A_DAY = TimeUnit.DAYS.toMillis(1);

    private static final long WARNING_AGE = TimeUnit.HOURS.toMillis(6L);

    @VisibleForTesting