Fix IMEI is not selectable
By settings textIsSelectable = true
Also unify all the similar logic into @style/device_info_dialog_value
Fix: 305248578
Test: manual - on About phone page
Change-Id: Iaa6b4ab45067a01106367de3b8d81d5df51bd6dc
diff --git a/res/layout/dialog_audio_sharing.xml b/res/layout/dialog_audio_sharing.xml
index 9624c90..5f26f74 100644
--- a/res/layout/dialog_audio_sharing.xml
+++ b/res/layout/dialog_audio_sharing.xml
@@ -23,7 +23,7 @@
android:orientation="vertical">
<TextView
- style="@style/device_info_dialog_value"
+ style="@style/DeviceAudioSharingText"
android:id="@+id/share_audio_subtitle1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
android:layout_gravity="center"/>
<TextView
- style="@style/device_info_dialog_value"
+ style="@style/DeviceAudioSharingText"
android:id="@+id/share_audio_subtitle2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/dialog_eid_status.xml b/res/layout/dialog_eid_status.xml
index 77d6494..3297dac 100644
--- a/res/layout/dialog_eid_status.xml
+++ b/res/layout/dialog_eid_status.xml
@@ -27,8 +27,7 @@
style="@style/device_info_dialog_value"
android:id="@+id/esim_id_value"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textIsSelectable="true" />
+ android:layout_height="wrap_content" />
<ImageView
android:id="@+id/esim_id_qrcode"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3a2f9ad..8736689 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -433,6 +433,15 @@
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:paddingBottom">24dp</item>
+ <item name="android:textIsSelectable">true</item>
+ </style>
+
+ <style name="DeviceAudioSharingText">
+ <item name="android:textAlignment">viewStart</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
+ <item name="android:textSize">14sp</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ <item name="android:paddingBottom">24dp</item>
</style>
<style name="ContextualCardStyle">
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
index e82d541..f212eea 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
@@ -111,10 +111,7 @@
Log.d(TAG, "Fragment not attached yet.");
return;
}
- setText(viewId, text, true);
- }
- public void setText(int viewId, CharSequence text, boolean enableCopy) {
final TextView textView = mRootView.findViewById(viewId);
if (textView == null) {
return;
@@ -125,6 +122,5 @@
text = PhoneNumberUtil.expandByTts(text);
}
textView.setText(text);
- textView.setTextIsSelectable(enableCopy);
}
}