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

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

Merge "[Satellite] Move satellite setting related code to a folder" into main

parents 504218a3 93f71444

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ 
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.network.telephony.SatelliteSetting" />

                       android:value="com.android.settings.network.telephony.satellite.SatelliteSetting" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_network"/>

        </activity>

res/xml/mobile_network_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ 
        <PreferenceCategory

            android:key="telephony_satellite_settings_category_key"

            android:title="@string/category_title_satellite_connectivity"

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

            settings:controller="com.android.settings.network.telephony.satellite.SatelliteSettingsPreferenceCategoryController">



            <com.android.settingslib.RestrictedPreference

                android:key="telephony_satellite_setting_key"
@@ -213,7 +213,7 @@ 
                android:title="@string/satellite_setting_title"

                settings:keywords="@string/keywords_satellite_setting"

                settings:controller=

                    "com.android.settings.network.telephony.SatelliteSettingPreferenceController"/>

                    "com.android.settings.network.telephony.satellite.SatelliteSettingPreferenceController"/>



        </PreferenceCategory>

res/xml/satellite_setting.xml

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
        android:key="key_category_satellite_apps"

        android:title="@string/category_title_satellite_supported_apps"

        settings:isPreferenceVisible="false"

        settings:controller="com.android.settings.network.telephony.SatelliteAppListCategoryController"

        settings:controller="com.android.settings.network.telephony.satellite.SatelliteAppListCategoryController"

        settings:searchable="false">



        <!-- See all satellite apps -->
@@ -74,7 +74,7 @@ 
            android:key="key_see_all_satellite_apps"

            android:title="@string/title_satellite_supported_app_list_entry"

            android:icon="@drawable/ic_chevron_right_24dp"

            android:fragment="com.android.settings.network.telephony.SatelliteAppListFragment"

            android:fragment="com.android.settings.network.telephony.satellite.SatelliteAppListFragment"

            android:order="5"

            settings:searchable="false"/>

    </PreferenceCategory>

src/com/android/settings/core/gateway/SettingsGateway.java

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ import com.android.settings.network.apn.ApnSettings; 
import com.android.settings.network.telephony.CellularSecuritySettingsFragment;

import com.android.settings.network.telephony.MobileNetworkSettings;

import com.android.settings.network.telephony.NetworkSelectSettings;

import com.android.settings.network.telephony.SatelliteSetting;

import com.android.settings.network.telephony.satellite.SatelliteSetting;

import com.android.settings.network.tether.TetherSettings;

import com.android.settings.nfc.PaymentSettings;

import com.android.settings.notification.ConfigureNotificationSettings;

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

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ import com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceCon 
import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController;

import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;

import com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController;

import com.android.settings.network.telephony.satellite.SatelliteSettingPreferenceController;

import com.android.settings.network.telephony.satellite.SatelliteSettingsPreferenceCategoryController;

import com.android.settings.network.telephony.wificalling.CrossSimCallingViewModel;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.wifi.WifiPickerTrackerHelper;