Merge "Popup a dialog to display user IMEI information" (0d4c9091) · Commits · e / os / android_packages_apps_Settings

res/layout/dialog_imei_info.xml

0 → 100644

+114 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		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.
		-->

		<ScrollView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:padding="@dimen/sim_content_padding">

		<!-- These items are only for CDMA phones -->
		<LinearLayout
		android:id="@+id/cdma_settings"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/min_number_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/status_min_number"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/min_number_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/prl_version_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/status_prl_version"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/prl_version_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/meid_number_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/status_meid_number"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/meid_number_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		</LinearLayout>

		<LinearLayout
		android:id="@+id/gsm_settings"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/imei_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/status_imei"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/imei_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/imei_sv_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/status_imei_sv"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/imei_sv_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>
		</LinearLayout>

		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/icc_id_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/status_icc_id"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/icc_id_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>
		</LinearLayout>
		</ScrollView>
		No newline at end of file

res/values/strings.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -2661,6 +2661,10 @@
		<string name="storage_settings_summary" product="nosdcard">Unmount USB storage, view available storage</string>
		<!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
		<string name="storage_settings_summary" product="default">Unmount SD card, view available storage</string>
		<!-- About phone screen, title for IMEI for multi-sim devices -->
		<string name="imei_multi_sim_slot_1">IMEI (sim slot 1)</string>
		<!-- About phone screen, title for IMEI for multi-sim devices -->
		<string name="imei_multi_sim_slot_2">IMEI (sim slot 2)</string>
		<!-- Do not translate. About phone, status item title -->
		<string name="status_imei">IMEI</string>
		<!-- Do not translate. About phone, status item title -->
		@@ -2677,6 +2681,10 @@
		<string name="status_msid_number">MSID</string>
		<!-- About phone, status item title. The phone PRL Version of the current device.-->
		<string name="status_prl_version">PRL version</string>
		<!-- About phone screen, title for MEID for multi-sim devices -->
		<string name="meid_multi_sim_sim_slot_1">MEID (sim slot 1)</string>
		<!-- About phone screen, title for MEID for multi-sim devices -->
		<string name="meid_multi_sim_sim_slot_2">MEID (sim slot 2)</string>
		<!-- About phone, status item title. The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
		<string name="status_meid_number">MEID</string>
		<!-- About phone, status item title. The ICCID of the current LTE device. [CHAR LIMIT=30] -->
		@@ -6555,6 +6563,7 @@
		<string name="keywords_payment_settings">pay, tap, payments</string>
		<string name="keywords_backup">backup, back up</string>
		<string name="keywords_assist_gesture_launch">gesture</string>
		<string name="keywords_imei_info">imei, meid</string>

		<!-- NFC Wi-Fi pairing/setup strings-->

res/values/styles.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -478,4 +478,14 @@
		<item name="android:textSize">@dimen/search_bar_text_size</item>
		</style>

		<style name="device_info_dialog_label">
		<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
		<item name="android:textColor">?android:attr/textColorSecondary</item>
		</style>

		<style name="device_info_dialog_value">
		<item name="android:textAppearance">@android:style/TextAppearance.Material.Body2</item>
		<item name="android:paddingBottom">24dp</item>
		</style>

		</resources>

res/xml/device_info_settings_v2.xml

+10 −2

Original line number	Diff line number	Diff line
		@@ -40,10 +40,18 @@
		android:title="@string/hardware_info"
		android:summary="@string/summary_placeholder"/>

		<!-- IMEI -->
		<!-- IMEI Sim Slot 1 -->
		<Preference
		android:key="imei_info"
		android:key="imei_info_sim_slot_1"
		android:title="@string/status_imei"
		settings:keywords="@string/keywords_imei_info"
		android:summary="@string/summary_placeholder"/>

		<!-- IMEI Sim Slot 2 -->
		<Preference
		android:key="imei_info_sim_slot_2"
		android:title="@string/imei_multi_sim_slot_2"
		settings:keywords="@string/keywords_imei_info"
		android:summary="@string/summary_placeholder"/>

		<!-- Android version -->

src/com/android/settings/DeviceInfoSettings.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ import com.android.settings.deviceinfo.DeviceModelPreferenceController;
		import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;
		import com.android.settings.deviceinfo.FeedbackPreferenceController;
		import com.android.settings.deviceinfo.FirmwareVersionPreferenceController;
		import com.android.settings.deviceinfo.imei.ImeiInfoDualSimPreferenceController;
		import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
		import com.android.settings.deviceinfo.KernelVersionPreferenceController;
		import com.android.settings.deviceinfo.ManualPreferenceController;
		import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController;
		@@ -120,7 +122,6 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
		Activity activity, Fragment fragment, Lifecycle lifecycle) {
		if (FeatureFlagUtils.isEnabled(DEVICE_INFO_V2_FEATURE_FLAG)) {
		final List<AbstractPreferenceController> controllers = new ArrayList<>();

		// Device name

		// Phone number
		@@ -129,7 +130,9 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {

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

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

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

		// Android version