DeviceInfo: move more prefereces in PreferenceController

Bug: 34774945
Test: make RunSettingsRoboTests
Change-Id: Ie5e113a6df85bab5be50c947bd7b91cfacdccb7f
This commit is contained in:
Fan Zhang
2017-02-23 17:50:27 -08:00
parent 3cac802860
commit efb8d625a2
21 changed files with 1030 additions and 256 deletions

View File

@@ -15,12 +15,11 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/about_settings">
<!-- System update settings - launches activity -->
<Preference android:key="additional_system_update_settings"
android:title="@string/additional_system_update_settings_list_item_title">
android:title="@string/additional_system_update_settings_list_item_title">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="@string/additional_system_update"
android:targetClass="@string/additional_system_update_menu" />
@@ -62,20 +61,13 @@
android:title="@string/device_feedback" />
<!-- Device hardware model -->
<com.android.settings.DividerPreference
<Preference
android:key="device_model"
android:enabled="false"
android:shouldDisableView="false"
android:selectable="false"
android:title="@string/model_info"
android:summary="@string/device_info_default"
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"/>
android:summary="@string/device_info_default"/>
<!-- Device firmware version -->
<Preference android:key="firmware_version"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/firmware_version"
android:summary="@string/device_info_default"/>
@@ -88,54 +80,33 @@
</Preference>
<!-- Device FCC equipment id -->
<com.android.settings.DividerPreference
<Preference
android:key="fcc_equipment_id"
android:enabled="false"
android:shouldDisableView="false"
android:selectable="false"
android:title="@string/fcc_equipment_id"
android:summary="@string/device_info_default"
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"/>
android:summary="@string/device_info_default"/>
<!-- Device Baseband version -->
<com.android.settings.DividerPreference
<Preference
android:key="baseband_version"
android:enabled="false"
android:shouldDisableView="false"
android:selectable="false"
android:title="@string/baseband_version"
android:summary="@string/device_info_default"
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"/>
android:summary="@string/device_info_default"/>
<!-- Device Kernel version -->
<com.android.settings.DividerPreference
<Preference
android:key="kernel_version"
android:enabled="false"
android:shouldDisableView="false"
android:selectable="false"
android:title="@string/kernel_version"
android:summary="@string/device_info_default"
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"/>
android:summary="@string/device_info_default"/>
<!-- Detailed build version -->
<Preference android:key="build_number"
android:enabled="false"
android:shouldDisableView="false"
<Preference
android:key="build_number"
android:title="@string/build_number"
android:summary="@string/device_info_default"/>
<!-- SELinux status information -->
<com.android.settings.DividerPreference
<Preference
android:key="selinux_status"
android:enabled="false"
android:shouldDisableView="false"
android:selectable="false"
android:title="@string/selinux_status"
android:summary="@string/selinux_status_enforcing"
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"/>
android:summary="@string/selinux_status_enforcing"/>
</PreferenceScreen>