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

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

Promotion of android_ui.lnx.2.1.c1-00007. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1084021   I4e4e2568f488b79e2090de27ca05858467927474   Settings: Fix settings force close in monkey test.
1039373   Ie29246173e79249c1d37b8c678ad192ce1d524ef   Settings:Fix settings config of show video call total da

Change-Id: I7adf8084a05a8a60f4788f99308d2e56e2a4a731
CRs-Fixed: 1084021, 1039373
parents fa8957c4 93d6c19d

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 {

src/com/android/settings/deviceinfo/PublicVolumeSettings.java

100644 → 100755
+10 −0
Original line number Diff line number Diff line
@@ -135,6 +135,16 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment { 
        final ViewGroup buttonBar = getButtonBar();

        buttonBar.removeAllViews();

        buttonBar.setPadding(padding, padding, padding, padding);



        //Fixed monkey test issue

        //Settings crash caused by null pointer parameter

        //Add check with mUnmount's values

        if (null == mUnmount) {

            mUnmount = new Button(getActivity());

            mUnmount.setText(R.string.storage_menu_unmount);

            mUnmount.setOnClickListener(mUnmountListener);

        }



        buttonBar.addView(mUnmount, new ViewGroup.LayoutParams(

                ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.WRAP_CONTENT));