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

Commit b5ce3cd9 authored by jackqdyulei's avatar jackqdyulei
Browse files

Fix TODO for mobile network settings 

1. Add intent filter to MobileNetworkActivity(new page)
2. Add metrics id
3. Remove obsolete TODOs

Bug: 114749736
Test: Manual
Change-Id: I36f41983dc8cc36ccdf548174fc494044ec1b241
parent 0057e45e

AndroidManifest.xml

+5 −1
Original line number Diff line number Diff line
@@ -139,7 +139,11 @@ 
                  android:label="@string/network_settings_title"

                  android:theme="@style/Theme.Settings.Home"

                  android:launchMode="singleTask">

            <!-- TODO(b/114749736): add intent filter here and disable the one in telephony -->

            <intent-filter android:priority="1">

                <action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />

                <action android:name="android.settings.DATA_ROAMING_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <!-- Alias for launcher activity only, as this belongs to each profile. -->

src/com/android/settings/network/telephony/MobileDataDialogFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network.telephony;



import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.DialogInterface;

import android.os.Bundle;
@@ -109,8 +110,7 @@ public class MobileDataDialogFragment extends InstrumentedDialogFragment impleme 


    @Override

    public int getMetricsCategory() {

        //TODO(b/114749736): add metric id for this fragment

        return 0;

        return SettingsEnums.MOBILE_DATA_DIALOG;

    }



    @Override

src/com/android/settings/network/telephony/MobileNetworkSettings.java

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment { 
        }

    }



    //TODO(b/114749736): update search provider

    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

                @Override

src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java

+0 −2
Original line number Diff line number Diff line
@@ -116,8 +116,6 @@ public class PreferredNetworkModePreferenceController extends BasePreferenceCont 
    }



    private int getPreferredNetworkModeSummaryResId(int NetworkMode) {

        //TODO(b/114749736): refactor it to "Preferred network mode: <Mode>", instead of building

        // string for each type...

        switch (NetworkMode) {

            case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA:

                return R.string.preferred_network_mode_tdscdma_gsm_wcdma_summary;

src/com/android/settings/network/telephony/RoamingDialogFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.network.telephony; 


import android.app.AlertDialog;

import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface.OnClickListener;
@@ -78,8 +79,7 @@ public class RoamingDialogFragment extends InstrumentedDialogFragment implements 


    @Override

    public int getMetricsCategory() {

        //TODO(b/114749736): add category for roaming dialog

        return 0;

        return SettingsEnums.MOBILE_ROAMING_DIALOG;

    }



    @Override