PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Polish the About Phone page." into pi-dev

Browse Source 
am: e645558049

Change-Id: I05a7128ca22960baa8ce19585441864f1d4d8a36
This commit is contained in:
Daniel Nishi
2018-03-30 23:56:52 +00:00
committed by android-build-merger
parent a5a338dff6 e645558049
commit 45a587441f
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/xml/my_device_info.xml
View File

@@ -28,26 +28,27 @@
android:layout="@layout/settings_entity_header" android:layout="@layout/settings_entity_header"
android:selectable="false"/> android:selectable="false"/>
<!-- Device name -->
<com.android.settings.widget.ValidatedEditTextPreference
android:key="device_name"
android:order="1"
android:title="@string/my_device_info_device_name_preference_title"
android:summary="@string/summary_placeholder"/>
<!-- Account name --> <!-- Account name -->
<Preference <Preference
android:key="branded_account" android:key="branded_account"
android:order="1" android:order="2"
android:title="@string/my_device_info_account_preference_title" android:title="@string/my_device_info_account_preference_title"
android:summary="@string/summary_placeholder"/> android:summary="@string/summary_placeholder"/>
<!-- Phone number --> <!-- Phone number -->
<Preference <Preference
android:key="phone_number" android:key="phone_number"
android:order="2"
android:title="@string/status_number"
android:summary="@string/summary_placeholder"/>
<!-- Device name -->
<com.android.settings.widget.ValidatedEditTextPreference
android:key="device_name"
android:order="3" android:order="3"
android:title="@string/my_device_info_device_name_preference_title" android:title="@string/status_number"
android:summary="@string/summary_placeholder"/> android:summary="@string/summary_placeholder"
android:selectable="false"/>
<Preference <Preference
android:key="emergency_info" android:key="emergency_info"
@@ -110,6 +111,7 @@
android:order="34" android:order="34"
android:title="@string/wifi_ip_address" android:title="@string/wifi_ip_address"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false"
settings:allowDividerAbove="true"/> settings:allowDividerAbove="true"/>
<!-- Wi-Fi MAC address --> <!-- Wi-Fi MAC address -->
@@ -117,14 +119,16 @@
android:key="wifi_mac_address" android:key="wifi_mac_address"
android:order="35" android:order="35"
android:title="@string/status_wifi_mac_address" android:title="@string/status_wifi_mac_address"
android:summary="@string/summary_placeholder"/> android:summary="@string/summary_placeholder"
android:selectable="false"/>
<!-- Bluetooth address --> <!-- Bluetooth address -->
<Preference <Preference
android:key="bt_address" android:key="bt_address"
android:order="36" android:order="36"
android:title="@string/status_bt_address" android:title="@string/status_bt_address"
android:summary="@string/summary_placeholder"/> android:summary="@string/summary_placeholder"
android:selectable="false"/>
<!-- Safety & regulatory manual --> <!-- Safety & regulatory manual -->
<Preference <Preference