Merge "[Settings] Refactor Wifi Calling description text"
This commit is contained in:
@@ -29,16 +29,11 @@
|
||||
|
||||
<FrameLayout
|
||||
android:id="@android:id/tabcontent"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="0dip" />
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/prefs_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:clipChildren="false"
|
||||
android:clipToPadding="false"
|
||||
android:clipChildren="true"
|
||||
android:clipToPadding="true"
|
||||
android:smoothScrollbar="false" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@@ -21,6 +21,7 @@
|
||||
|
||||
<com.android.settings.wifi.calling.ListWithEntrySummaryPreference
|
||||
android:key="wifi_calling_mode"
|
||||
isPreferenceVisible="false"
|
||||
android:title="@string/wifi_calling_mode_title"
|
||||
android:summary="@string/wifi_calling_mode_title"
|
||||
android:entries="@array/wifi_calling_mode_choices"
|
||||
@@ -30,6 +31,7 @@
|
||||
|
||||
<com.android.settings.wifi.calling.ListWithEntrySummaryPreference
|
||||
android:key="wifi_calling_roaming_mode"
|
||||
isPreferenceVisible="false"
|
||||
android:title="@string/wifi_calling_roaming_mode_title"
|
||||
android:summary="@string/wifi_calling_roaming_mode_summary"
|
||||
android:entries="@array/wifi_calling_mode_choices_v2"
|
||||
@@ -39,7 +41,12 @@
|
||||
|
||||
<Preference
|
||||
android:key="emergency_address_key"
|
||||
isPreferenceVisible="false"
|
||||
android:title="@string/emergency_address_title"
|
||||
android:summary="@string/emergency_address_summary" />
|
||||
|
||||
<com.android.settings.wifi.calling.LinkifyDescriptionPreference
|
||||
android:key="no_options_description"
|
||||
isPreferenceVisible="false" />
|
||||
|
||||
</PreferenceScreen>
|
||||
|
Reference in New Issue
Block a user