Dynamic preferences for sim status (34c2387f) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+1 −3

Original line number	Diff line number	Diff line
		@@ -6441,9 +6441,7 @@
		<!-- SIM status title [CHAR LIMIT=40] -->
		<string name="sim_status_title">SIM status</string>
		<!-- SIM status title [CHAR LIMIT=40] -->
		<string name="sim_status_title_sim_slot_1">SIM status (sim slot 1)</string>
		<!-- SIM status title [CHAR LIMIT=40] -->
		<string name="sim_status_title_sim_slot_2">SIM status (sim slot 2)</string>
		<string name="sim_status_title_sim_slot">SIM status (sim slot %1$d)</string>
		<!-- Title for call back. [CHAR LIMIT=60] -->
		<string name="sim_call_back_title">Call back from default SIM</string>
		<!-- Title for outgoing back. [CHAR LIMIT=60] -->

res/xml/device_info_settings_v2.xml

+2 −10

Original line number	Diff line number	Diff line
		@@ -29,21 +29,13 @@
		android:title="@string/status_number"
		android:summary="@string/summary_placeholder"/>

		<!-- SIM status Sim Slot 1 -->
		<!-- SIM status -->
		<Preference
		android:key="sim_status_sim_1"
		android:key="sim_status"
		android:order="10"
		android:title="@string/sim_status_title"
		android:summary="@string/summary_placeholder"/>

		<!-- SIM status Sim Slot 2-->
		<Preference
		android:key="sim_status_sim_2"
		android:order="11"
		android:title="@string/sim_status_title_sim_slot_2"
		android:summary="@string/summary_placeholder"/>


		<!-- Model & hardware -->
		<Preference
		android:key="device_model"

src/com/android/settings/DeviceInfoSettings.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import com.android.settings.deviceinfo.SecurityPatchPreferenceController;
		import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;
		import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
		import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
		import com.android.settings.deviceinfo.simstatus.SimStatusDualSimPreferenceController;
		import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		@@ -133,8 +132,6 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {

		controllers.add(new SimStatusPreferenceControllerV2(context, fragment));

		controllers.add(new SimStatusDualSimPreferenceController(context, fragment));

		controllers.add(new DeviceModelPreferenceController(context, fragment));

		controllers.add(new ImeiInfoPreferenceControllerV2(context, fragment));

src/com/android/settings/deviceinfo/simstatus/AbstractSimStatusPreferenceController.java

deleted100644 → 0

+0 −98

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.deviceinfo.simstatus;

		import android.app.Fragment;
		import android.content.Context;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.PreferenceScreen;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;

		import com.android.settings.R;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;

		import java.util.List;

		public abstract class AbstractSimStatusPreferenceController extends
		AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {

		protected final boolean mIsMultiSim;
		protected final TelephonyManager mTelephonyManager;
		private final SubscriptionManager mSubscriptionManager;
		private final Fragment mFragment;

		private Preference mPreference;

		public AbstractSimStatusPreferenceController(Context context, Fragment fragment) {
		super(context);

		mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
		mSubscriptionManager = (SubscriptionManager) context.getSystemService(
		Context.TELEPHONY_SUBSCRIPTION_SERVICE);
		mFragment = fragment;
		mIsMultiSim = mTelephonyManager.getPhoneCount() > 1;
		}

		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		mPreference = screen.findPreference(getPreferenceKey());
		if (mPreference == null) {
		return;
		}

		mPreference.setTitle(getPreferenceTitle());
		mPreference.setSummary(getCarrierName());
		}

		@Override
		public boolean handlePreferenceTreeClick(Preference preference) {
		if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
		return false;
		}

		SimStatusDialogFragment.show(mFragment, getSimSlot(), getPreferenceTitle());
		return true;
		}

		/**
		* @return The preference title for the displayed preference.
		*/
		protected abstract String getPreferenceTitle();

		/**
		* @return The sim slot to retrieve sim status information about.
		*/
		protected abstract int getSimSlot();

		private CharSequence getCarrierName() {
		final List<SubscriptionInfo> subscriptionInfoList =
		mSubscriptionManager.getActiveSubscriptionInfoList();
		if (subscriptionInfoList != null) {
		for (SubscriptionInfo info : subscriptionInfoList) {
		if (info.getSimSlotIndex() == getSimSlot()) {
		return info.getCarrierName();
		}
		}
		}
		return mContext.getText(R.string.device_info_not_available);
		}
		}

src/com/android/settings/deviceinfo/simstatus/SimStatusDualSimPreferenceController.java

deleted100644 → 0

+0 −52

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.deviceinfo.simstatus;

		import android.app.Fragment;
		import android.content.Context;

		import com.android.settings.R;

		public class SimStatusDualSimPreferenceController extends AbstractSimStatusPreferenceController {

		private static final int SIM_SLOT = 1;
		private static final String SIM_STATUS_DUAL_SIM_KEY = "sim_status_sim_2";

		public SimStatusDualSimPreferenceController(Context context, Fragment fragment) {
		super(context, fragment);
		}

		@Override
		public boolean isAvailable() {
		return super.isAvailable() && mIsMultiSim;
		}

		@Override
		protected String getPreferenceTitle() {
		return mContext.getResources().getString(R.string.sim_status_title_sim_slot_2);
		}

		@Override
		protected int getSimSlot() {
		return SIM_SLOT;
		}

		@Override
		public String getPreferenceKey() {
		return SIM_STATUS_DUAL_SIM_KEY;
		}
		}