Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11f698ba authored Dec 14, 2018 by Ben Lin

Add boolean flags to show/hide top-most settings.

Bug: None
Test: RunSettingsRoboTests
Change-Id: Ib576f5979feda0fa7f573915acffc5065d40095c

parent 0f95d9c4

res/values/bools.xml

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -168,6 +168,15 @@
	<!-- Whether device_model should be shown or not. -->		<!-- Whether device_model should be shown or not. -->
	<bool name="config_show_device_model">true</bool>		<bool name="config_show_device_model">true</bool>

			<!-- Whether top_level_battery should be shown or not. -->
			<bool name="config_show_top_level_battery">true</bool>

			<!-- Whether top_level_connected_devices should be shown or not. -->
			<bool name="config_show_top_level_connected_devices">true</bool>

			<!-- Whether top_level_display should be shown or not. -->
			<bool name="config_show_top_level_display">true</bool>

	<!-- Whether wifi_ip_address should be shown or not. -->		<!-- Whether wifi_ip_address should be shown or not. -->
	<bool name="config_show_wifi_ip_address">true</bool>		<bool name="config_show_wifi_ip_address">true</bool>

src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package com.android.settings.connecteddevice;
	import android.content.Context;		import android.content.Context;

	import com.android.settings.core.BasePreferenceController;		import com.android.settings.core.BasePreferenceController;
			import com.android.settings.R;

	public class TopLevelConnectedDevicesPreferenceController extends BasePreferenceController {		public class TopLevelConnectedDevicesPreferenceController extends BasePreferenceController {

	@@ -29,7 +30,9 @@ public class TopLevelConnectedDevicesPreferenceController extends BasePreference

	@Override		@Override
	public int getAvailabilityStatus() {		public int getAvailabilityStatus() {
	return AVAILABLE_UNSEARCHABLE;		return mContext.getResources().getBoolean(R.bool.config_show_top_level_connected_devices)
			? AVAILABLE_UNSEARCHABLE
			: UNSUPPORTED_ON_DEVICE;
	}		}

	@Override		@Override

src/com/android/settings/display/TopLevelDisplayPreferenceController.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,9 @@ public class TopLevelDisplayPreferenceController extends BasePreferenceControlle

	@Override		@Override
	public int getAvailabilityStatus() {		public int getAvailabilityStatus() {
	return AVAILABLE;		return mContext.getResources().getBoolean(R.bool.config_show_top_level_display)
			? AVAILABLE
			: UNSUPPORTED_ON_DEVICE;
	}		}

	@Override		@Override

src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -48,7 +48,9 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle

	@Override		@Override
	public int getAvailabilityStatus() {		public int getAvailabilityStatus() {
	return AVAILABLE_UNSEARCHABLE;		return mContext.getResources().getBoolean(R.bool.config_show_top_level_battery)
			? AVAILABLE_UNSEARCHABLE
			: UNSUPPORTED_ON_DEVICE;
	}		}

	@Override		@Override

tests/robotests/res/values-mcc999/config.xml

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -58,6 +58,9 @@
	<bool name="config_show_system_update_settings">false</bool>		<bool name="config_show_system_update_settings">false</bool>
	<bool name="config_wifi_support_connected_mac_randomization">false</bool>		<bool name="config_wifi_support_connected_mac_randomization">false</bool>
	<bool name="config_show_device_model">false</bool>		<bool name="config_show_device_model">false</bool>
			<bool name="config_show_top_level_battery">false</bool>
			<bool name="config_show_top_level_connected_devices">false</bool>
			<bool name="config_show_top_level_display">false</bool>
	<bool name="config_show_wifi_ip_address">false</bool>		<bool name="config_show_wifi_ip_address">false</bool>
	<bool name="config_show_wifi_mac_address">false</bool>		<bool name="config_show_wifi_mac_address">false</bool>
	<bool name="config_disable_uninstall_update">true</bool>		<bool name="config_disable_uninstall_update">true</bool>