Merge "delete DeviceInfoSettings and activity, pref xml" (ad90960b) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+0 −29

Original line number	Diff line number	Diff line
		@@ -957,35 +957,6 @@
		android:value="com.android.settings.display.NightDisplaySettings" />
		</activity>

		<activity
		android:name="Settings$DeviceInfoSettingsActivity"
		android:label="@string/device_info_settings"
		android:icon="@drawable/ic_settings_about"
		android:taskAffinity="com.android.settings"
		android:enabled="false"
		android:parentActivityName="Settings">
		<intent-filter android:priority="1">
		<action android:name="android.settings.DEVICE_INFO_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.DEFAULT" />
		<category android:name="android.intent.category.VOICE_LAUNCH" />
		</intent-filter>
		<intent-filter android:priority="10">
		<action android:name="com.android.settings.action.SETTINGS" />
		</intent-filter>
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.system" />
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/about_settings" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.deviceinfo.DeviceInfoSettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>

		<activity android:name=".Settings$MyDeviceInfoActivity"
		android:label="@string/about_settings"
		android:icon="@drawable/ic_settings_about"

res/values/strings.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -2747,11 +2747,6 @@
		<!-- Instructions telling the user that the operation to unlock the keyguard with SIM PIN failed. Displayed in one line in a large font. [CHAR LIMIT=40] -->
		<string name="pin_failed">SIM PIN operation failed!</string>

		<!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
		<string name="device_info_settings" product="tablet">Tablet status</string>
		<!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
		<string name="device_info_settings" product="default">Phone status</string>

		<!-- About phone screen, list item title. Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
		<string name="system_update_settings_list_item_title">System updates</string>
		<!-- About phone screen, list item summary. Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->

res/xml/device_info_settings.xml

deleted100644 → 0

+0 −142

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.
		-->

		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="device_info_pref_screen"
		android:title="@string/about_settings">

		<!-- Phone number -->
		<Preference
		android:key="phone_number"
		android:order="0"
		android:title="@string/status_number"
		android:summary="@string/summary_placeholder" />

		<!-- SIM status -->
		<Preference
		android:key="sim_status"
		android:order="10"
		android:title="@string/sim_status_title"
		settings:keywords="@string/keywords_sim_status"
		android:summary="@string/summary_placeholder" />

		<!-- Model & hardware -->
		<Preference
		android:key="device_model_v1"
		android:order="21"
		android:title="@string/hardware_info"
		settings:keywords="@string/keywords_model_and_hardware"
		android:summary="@string/summary_placeholder"
		settings:controller="com.android.settings.deviceinfo.DeviceModelPreferenceController" />

		<!-- IMEI -->
		<Preference
		android:key="imei_info"
		android:order="22"
		android:title="@string/status_imei"
		settings:keywords="@string/keywords_imei_info"
		android:summary="@string/summary_placeholder" />

		<!-- Android version -->
		<Preference
		android:key="firmware_version"
		android:order="32"
		android:title="@string/firmware_version"
		settings:keywords="@string/keywords_android_version"
		android:summary="@string/summary_placeholder"
		settings:controller=
		"com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController" />

		<!--IP address -->
		<Preference
		android:key="wifi_ip_address"
		android:order="34"
		android:title="@string/wifi_ip_address"
		android:summary="@string/summary_placeholder"
		settings:allowDividerAbove="true" />

		<!-- Wi-Fi MAC address -->
		<Preference
		android:key="wifi_mac_address"
		android:order="35"
		android:title="@string/status_wifi_mac_address"
		android:summary="@string/summary_placeholder" />

		<!-- Bluetooth address -->
		<Preference
		android:key="bt_address"
		android:order="36"
		android:title="@string/status_bt_address"
		android:summary="@string/summary_placeholder" />


		<!-- Legal information -->
		<Preference
		android:key="legal_container"
		android:order="37"
		android:title="@string/legal_information"
		android:fragment="com.android.settings.LegalSettings"
		settings:allowDividerAbove="true" />

		<!-- Regulatory labels -->
		<Preference
		android:key="regulatory_info"
		android:order="38"
		android:title="@string/regulatory_labels">
		<intent android:action="android.settings.SHOW_REGULATORY_INFO" />
		</Preference>

		<!-- Safety & regulatory manual -->
		<Preference
		android:key="safety_info"
		android:order="39"
		android:title="@string/safety_and_regulatory_info">
		<intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO" />
		</Preference>

		<!-- Manual -->
		<Preference
		android:key="manual"
		android:order="40"
		android:title="@string/manual">
		<intent android:action="android.settings.SHOW_MANUAL" />
		</Preference>

		<!-- Feedback on the device -->
		<Preference
		android:key="device_feedback"
		android:order="41"
		android:title="@string/device_feedback" />

		<!-- Device FCC equipment id -->
		<Preference
		android:key="fcc_equipment_id"
		android:order="42"
		android:title="@string/fcc_equipment_id"
		android:summary="@string/summary_placeholder" />

		<!-- Build number -->
		<Preference
		android:key="build_number"
		android:order="43"
		android:title="@string/build_number"
		android:summary="@string/summary_placeholder"
		settings:allowDividerAbove="true" />

		</PreferenceScreen>
		No newline at end of file

src/com/android/settings/Settings.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ public class Settings extends SettingsActivity {
		public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }
		public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }
		public static class NightDisplaySuggestionActivity extends NightDisplaySettingsActivity { /* empty */ }
		public static class DeviceInfoSettingsActivity extends SettingsActivity { /* empty */ }
		public static class MyDeviceInfoActivity extends SettingsActivity { /* empty */ }
		public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
		public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/SettingsActivity.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -710,19 +710,6 @@ public class SettingsActivity extends SettingsDrawerActivity
		WifiDisplaySettings.isAvailable(this), isAdmin)
		\|\| somethingChanged;

		// Enable/disable the Me Card page.
		final boolean aboutPhoneV2Enabled = featureFactory
		.getAccountFeatureProvider()
		.isAboutPhoneV2Enabled(this);
		somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
		Settings.MyDeviceInfoActivity.class.getName()),
		aboutPhoneV2Enabled, isAdmin)
		\|\| somethingChanged;
		somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
		Settings.DeviceInfoSettingsActivity.class.getName()),
		!aboutPhoneV2Enabled, isAdmin)
		\|\| somethingChanged;

		if (UserHandle.MU_ENABLED && !isAdmin) {

		// When on restricted users, disable all extra categories (but only the settings ones).