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

Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev am: 7d76797f94

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

Change-Id: I5c12ad23a240fbe70630855e5f98b5be83912674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bonian Chen
2023-02-23 12:03:46 +00:00
committed by Automerger Merge Worker
parent 23ebc49810 7d76797f94
commit 550b5a0ba1
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/arrays.xml
View File

@@ -1418,4 +1418,9 @@
<item>@color/screen_flash_preset_opacity_color_11</item>
<item>@color/screen_flash_preset_opacity_color_12</item>
</array>
<!-- hide 3G option from preferred network type UI -->
<integer-array name="network_mode_3g_deprecated_carrier_id" translatable="false">
</integer-array>
</resources>

19
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -22,6 +22,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
import android.content.Context;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
@@ -244,6 +245,24 @@ public class EnabledNetworkModePreferenceController extends
// TODO: Using the carrier config.
mDisplay3gOptions = getResourcesForSubId().getBoolean(
R.bool.config_display_network_mode_3g_option);
int[] carriersWithout3gMenu = getResourcesForSubId().getIntArray(
R.array.network_mode_3g_deprecated_carrier_id);
if ((carriersWithout3gMenu != null) && (carriersWithout3gMenu.length > 0)) {
SubscriptionManager sm = mContext.getSystemService(SubscriptionManager.class);
SubscriptionInfo subInfo = sm.getActiveSubscriptionInfo(mSubId);
if (subInfo != null) {
int carrierId = subInfo.getCarrierId();
for (int idx = 0; idx < carriersWithout3gMenu.length; idx++) {
if (carrierId == carriersWithout3gMenu[idx]) {
mDisplay3gOptions = false;
break;
}
}
}
}
mLteEnabled = carrierConfig.getBoolean(CarrierConfigManager.KEY_LTE_ENABLED_BOOL);
}
Log.d(LOG_TAG, "PreferenceEntriesBuilder: subId" + mSubId