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

Commit ee90cc33 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00028. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1039373   Ie29246173e79249c1d37b8c678ad192ce1d524ef   Settings:Fix settings config of show video call total da
1066739   I475b6a6f98b81e15a08cd33e3f26c16e98791f96   Settings: PN list not be modified for "46012" card in CT

Change-Id: I261c275915c57e143873b775050cdb4cc1470948
CRs-Fixed: 1039373, 1066739
parents 29175b00 07cc4f3f

res/values/arrays.xml

+1 −0
Original line number Diff line number Diff line
@@ -1107,5 +1107,6 @@ 
        <item>45507</item>

        <item>46003</item>

        <item>46011</item>

        <item>46012</item>

    </string-array>

</resources>

res/values/config.xml

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
    <!-- When true enable color temperature setting. -->

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



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



    <!-- carrier tethering default ssid and password begin -->

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ public class DataUsageList extends DataUsageBase { 
                collapseKey = uid;

                category = AppItem.CATEGORY_APP;

            } else if ((ai != null) && (uid == ai.uid) && getContext().getResources().getBoolean(

                    R.bool.config_video_call_datausage_enable)){

                    com.android.internal.R.bool.config_video_call_datausage_enable)){

                collapseKey = uid;

                category = AppItem.CATEGORY_APP;

            } else {