Merge "Convert more of StatusFragment to PreferenceControllers" (0f3bb044) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+0 −10

Original line number	Diff line number	Diff line
		@@ -2692,8 +2692,6 @@
		<string name="status_bt_address">Bluetooth address</string>
		<!-- About phone, status item title. The hardware serial number. [CHAR LIMIT=30]-->
		<string name="status_serial_number">Serial number</string>
		<!-- About phone, status item value if the actual value is not available. -->
		<string name="status_unavailable">Unavailable</string>
		<!-- About phone, status item title. How long the device has been running since its last reboot. -->
		<string name="status_up_time">Up time</string>
		<!-- About phone, status item title. How much time the device has had its main CPU awake. -->
		@@ -5529,8 +5527,6 @@
		<!-- Messaage shown in dialog when you can't manually sync -->
		<string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.</string>

		<string name="wimax_settings">4G</string>
		<string name="status_wimax_mac_address">4G MAC address</string>
		<!-- This is displayed to the user when the device needs to be decrypted -->
		<string name="enter_password">To start Android, enter your password</string>
		<!-- Informational text on the pin entry screen prompting the user for their pin -->
		@@ -9070,10 +9066,4 @@
		<!-- Note displayed when certain features are not available on low ram devices. [CHAR LIMIT=NONE] -->
		<string name="disabled_low_ram_device">This feature is not available on this device</string>

		<!--Label of IMS registration header -->
		<string name="ims_reg_title">"IMS registration state"</string>
		<!--Used when IMS registration state is registered -->
		<string name="ims_reg_status_registered">"Registered"</string>
		<!--Used when IMS registration state is not registered -->
		<string name="ims_reg_status_not_registered">"Not registered"</string>
		</resources>

res/xml/device_info_status.xml

+0 −7

Original line number	Diff line number	Diff line
		@@ -82,13 +82,6 @@
		android:title="@string/status_up_time"
		android:summary="@string/summary_placeholder"
		android:persistent="false" />
		<Preference
		android:key="wimax_mac_address"
		android:enabled="false"
		android:shouldDisableView="false"
		android:title="@string/status_wimax_mac_address"
		android:summary="@string/summary_placeholder"
		android:persistent="false" />
		<Preference
		android:key="ims_reg_state"
		android:enabled="false"

src/com/android/settings/deviceinfo/BluetoothAddressPreferenceController.java

0 → 100644

+35 −0

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;

		import android.content.Context;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.deviceinfo.AbstractBluetoothAddressPreferenceController;

		/**
		* Concrete subclass of bluetooth address preference controller
		*/
		public class BluetoothAddressPreferenceController extends
		AbstractBluetoothAddressPreferenceController implements PreferenceControllerMixin {
		public BluetoothAddressPreferenceController(Context context, Lifecycle lifecycle) {
		super(context, lifecycle);
		}

		// This space intentionally left blank
		}

src/com/android/settings/deviceinfo/ImsStatusPreferenceController.java

0 → 100644

+36 −0

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;

		import android.content.Context;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.deviceinfo.AbstractImsStatusPreferenceController;

		/**
		* Concrete subclass of IMS status preference controller
		*/
		public class ImsStatusPreferenceController extends AbstractImsStatusPreferenceController
		implements PreferenceControllerMixin {
		public ImsStatusPreferenceController(Context context,
		Lifecycle lifecycle) {
		super(context, lifecycle);
		}

		// This space intentionally left blank
		}

src/com/android/settings/deviceinfo/IpAddressPreferenceController.java

0 → 100644

+35 −0

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;

		import android.content.Context;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.deviceinfo.AbstractIpAddressPreferenceController;

		/**
		* Concrete subclass of IP address preference controller
		*/
		public class IpAddressPreferenceController extends AbstractIpAddressPreferenceController implements
		PreferenceControllerMixin {
		public IpAddressPreferenceController(Context context, Lifecycle lifecycle) {
		super(context, lifecycle);
		}

		// This space intentionally left blank
		}