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

Commit d03411f0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Align SETTINGS_PACKAGE_NAME reference to a single place"

parents 956f288d f677ee60

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.settings.connecteddevice;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.net.Uri;
@@ -36,7 +38,6 @@ import com.android.settingslib.search.SearchIndexable; 
public class ConnectedDeviceDashboardFragment extends DashboardFragment {



    private static final String TAG = "ConnectedDeviceFrag";

    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";

    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE";

src/com/android/settings/network/MobileNetworkIntentConverter.java

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.network;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.app.Activity;

import android.content.ComponentName;

import android.content.Context;
@@ -51,7 +53,7 @@ public class MobileNetworkIntentConverter implements Function<Intent, Intent> { 
    private static final String TAG = "MobileNetworkIntentConverter";



    private static final ComponentName sTargetComponent = ComponentName

            .createRelative("com.android.settings",

            .createRelative(SETTINGS_PACKAGE_NAME,

                    MobileNetworkActivity.class.getTypeName());

    private static final String INTENT_TRAMPOLINE = "android.settings.SEARCH_RESULT_TRAMPOLINE";

    /**

src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java

+4 −2
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.settings.network.telephony.gsm; 
import static androidx.lifecycle.Lifecycle.Event.ON_START;

import static androidx.lifecycle.Lifecycle.Event.ON_STOP;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.app.ProgressDialog;

import android.content.Context;

import android.content.Intent;
@@ -170,8 +172,8 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon 
        } else {

            if (mSwitchPreference != null) {

                Intent intent = new Intent();

                intent.setClassName("com.android.settings",

                        "com.android.settings.Settings$NetworkSelectActivity");

                intent.setClassName(SETTINGS_PACKAGE_NAME,

                        SETTINGS_PACKAGE_NAME + ".Settings$NetworkSelectActivity");

                intent.putExtra(Settings.EXTRA_SUB_ID, mSubId);

                mSwitchPreference.setIntent(intent);

            }

src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java

+4 −2
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.settings.network.telephony.gsm; 
import static androidx.lifecycle.Lifecycle.Event.ON_START;

import static androidx.lifecycle.Lifecycle.Event.ON_STOP;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.content.Context;

import android.content.Intent;

import android.provider.Settings;
@@ -101,8 +103,8 @@ public class OpenNetworkSelectPagePreferenceController extends 
                != TelephonyManager.NETWORK_SELECTION_MODE_AUTO);



        Intent intent = new Intent();

        intent.setClassName("com.android.settings",

                "com.android.settings.Settings$NetworkSelectActivity");

        intent.setClassName(SETTINGS_PACKAGE_NAME,

                SETTINGS_PACKAGE_NAME + ".Settings$NetworkSelectActivity");

        intent.putExtra(Settings.EXTRA_SUB_ID, mSubId);

        preference.setIntent(intent);

    }