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

Commit 353e52ee authored by Fang Yunong's avatar Fang Yunong Committed by Linux Build Service Account
Browse files

TMO: Settings Support for Self Service/MyAccount requirements from TMO 

Function description:
Support for Self Service/MyAccount requirements from TMO

Change-Id: I281d6a1ae3aa2d6bea3d2fb661652d970e2765ef
CRs-Fixed: 1039219
parent a32c2bb9

res/values/arrays.xml

100755 → 100644
+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ 
        <item>All</item>

    </string-array>



    <!-- There is a setting to control if an app is able to clear cache in settings::apps. -->

    <string-array name="no_cache_clear_package_list" translatable="false">

        <item></item>

    </string-array>



    <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->

    <string-array name="screen_timeout_entries">

        <item>15 seconds</item>

res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ 
    <bool name="config_allow_edit_carrier_enabled" translatable="false">false</bool>



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



    <!-- Config voice over lte in wireless settings begin -->

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

    <!-- Config voice over lte in wireless settings end -->



    <!-- When true enable color temperature setting. -->

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

res/xml/wireless_settings.xml

+3 −0
Original line number Diff line number Diff line
@@ -89,4 +89,7 @@ 
        android:key="proxy_settings"

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



    <SwitchPreference

        android:key="voice_over_lte"

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

</PreferenceScreen>

src/com/android/settings/WirelessSettings.java

+13 −0
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde 


    private PreferenceScreen mButtonWfc;



    private static final String VOICE_OVER_LTE = "voice_over_lte";

    private SwitchPreference mVoLtePreference;

    private boolean mLteEnabled = false;

    /**

     * Invoked on each preference click in this hierarchy, overrides

     * PreferenceFragment's implementation.  Used to make sure we track the
@@ -113,6 +116,8 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde 
            return true;

        } else if (preference == findPreference(KEY_MANAGE_MOBILE_PLAN)) {

            onManageMobilePlanClick();

        } else if (mLteEnabled && preference == mVoLtePreference) {

            ImsManager.setEnhanced4gLteModeSetting(getActivity(), mVoLtePreference.isChecked());

        } else if (preference == findPreference(KEY_MOBILE_NETWORK_SETTINGS)

                && mIsNetworkSettingsAvailable) {

            onMobileNetworkSettingsClick();
@@ -361,6 +366,14 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde 
            // Grey out if provisioning is not available.

            p.setEnabled(!TetherSettings

                    .isProvisioningNeededButUnavailable(getActivity()));

        mLteEnabled = getActivity().getResources().getBoolean(R.bool.config_voice_over_lte_enabled);

        mVoLtePreference = (SwitchPreference) findPreference(VOICE_OVER_LTE);

        if (mLteEnabled) {

            mVoLtePreference.setChecked(

                    ImsManager.isEnhanced4gLteModeSettingEnabledByUser(getActivity()));

        } else {

            getPreferenceScreen().removePreference(mVoLtePreference);

        }

        }

    }

src/com/android/settings/applications/AppStorageSettings.java

+18 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.os.storage.VolumeInfo; 
import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceCategory;

import android.text.format.Formatter;

import android.text.TextUtils;

import android.util.Log;

import android.util.MutableInt;

import android.view.View;
@@ -263,6 +264,22 @@ public class AppStorageSettings extends AppInfoWithHeader 
        return Formatter.formatFileSize(getActivity(), size);

    }



    private boolean isCacheClearableApp(){

        String currentPkgName = this.mPackageInfo.packageName;

        String [] appPackageName = getResources().getStringArray(

                R.array.no_cache_clear_package_list);

        if (TextUtils.isEmpty(currentPkgName)) {

            return false;

        }

        int length = appPackageName.length;

        for (int i = 0; i < length; i++) {

            if (currentPkgName.equals(appPackageName[i])) {

                return false;

            }

        }

        return true;

    }



    private void refreshSizeInfo() {

        if (mAppEntry.size == ApplicationsState.SIZE_INVALID

                || mAppEntry.size == ApplicationsState.SIZE_UNKNOWN) {
@@ -316,7 +333,7 @@ public class AppStorageSettings extends AppInfoWithHeader 
                mClearDataButton.setEnabled(true);

                mClearDataButton.setOnClickListener(this);

            }

            if (cacheSize <= 0) {

            if (cacheSize <= 0 || !isCacheClearableApp()) {

                mClearCacheButton.setEnabled(false);

            } else {

                mClearCacheButton.setEnabled(true);