PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee am: 24835ea2f9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884

Change-Id: Ie89e48f670b7e3cc8d8d607149d35c678b67ae8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-12-15 12:59:37 +00:00
committed by Automerger Merge Worker
parent e2fa501390 24835ea2f9
commit 8a26d010d0
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
View File

@@ -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";

4
src/com/android/settings/network/MobileNetworkIntentConverter.java
View File

@@ -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";
/**

6
src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
View File

@@ -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);
}

6
src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
View File

@@ -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);
}