Merge "Enable copying for some settings preferences."

This commit is contained in:
Doris Ling
2018-11-28 23:03:33 +00:00
committed by Android (Google) Code Review
3 changed files with 17 additions and 9 deletions

View File

@@ -182,6 +182,7 @@
android:selectable="false" android:selectable="false"
android:order="9999" android:order="9999"
settings:controller="com.android.settings.applications.appinfo.AppVersionPreferenceController" settings:controller="com.android.settings.applications.appinfo.AppVersionPreferenceController"
settings:allowDividerAbove="true" /> settings:allowDividerAbove="true"
settings:enableCopying="true"/>
</PreferenceScreen> </PreferenceScreen>

View File

@@ -32,7 +32,8 @@
android:key="device_name" android:key="device_name"
android:order="1" android:order="1"
android:title="@string/my_device_info_device_name_preference_title" android:title="@string/my_device_info_device_name_preference_title"
android:summary="@string/summary_placeholder"/> android:summary="@string/summary_placeholder"
settings:enableCopying="true" />
<!-- Account name --> <!-- Account name -->
<Preference <Preference
@@ -50,7 +51,8 @@
android:selectable="false" android:selectable="false"
settings:allowDynamicSummaryInSlice="true" settings:allowDynamicSummaryInSlice="true"
settings:controller= settings:controller=
"com.android.settings.deviceinfo.PhoneNumberPreferenceController" /> "com.android.settings.deviceinfo.PhoneNumberPreferenceController"
settings:enableCopying="true" />
<Preference <Preference
android:key="emergency_info" android:key="emergency_info"
@@ -129,7 +131,8 @@
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" android:selectable="false"
settings:allowDividerAbove="true"/> settings:allowDividerAbove="true"
settings:enableCopying="true" />
<!-- Wi-Fi MAC address --> <!-- Wi-Fi MAC address -->
<Preference <Preference
@@ -137,7 +140,8 @@
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"/> android:selectable="false"
settings:enableCopying="true" />
<!-- Bluetooth address --> <!-- Bluetooth address -->
<Preference <Preference
@@ -145,7 +149,8 @@
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"/> android:selectable="false"
settings:enableCopying="true" />
<!-- Device up time --> <!-- Device up time -->
<Preference <Preference
@@ -183,6 +188,7 @@
android:order="43" android:order="43"
android:title="@string/build_number" android:title="@string/build_number"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true"/> settings:allowDividerAbove="true"
settings:enableCopying="true" />
</PreferenceScreen> </PreferenceScreen>

View File

@@ -102,6 +102,7 @@
android:selectable="false"> android:selectable="false">
<Preference <Preference
android:key="ipv6_addresses" android:key="ipv6_addresses"
android:selectable="false"/> android:selectable="false"
settings:enableCopying="true"/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>