Merge "Update misc strings" into oc-mr1-dev

This commit is contained in:
TreeHugger Robot
2017-07-26 04:59:29 +00:00
committed by Android (Google) Code Review
4 changed files with 11 additions and 9 deletions

View File

@@ -57,6 +57,7 @@
<Preference
android:key="reset_dashboard"
android:title="@string/reset_dashboard_title"
android:summary="@string/reset_dashboard_summary"
android:icon="@drawable/ic_restore"
android:order="-20"
android:fragment="com.android.settings.system.ResetDashboardFragment" />

View File

@@ -19,7 +19,7 @@
<Preference
android:key="wifi_tether"
android:title="@string/wifi_tether_checkbox_text"
android:title="@string/wifi_hotspot_checkbox_text"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.wifi.tether.WifiTetherSettings" />
@@ -30,7 +30,7 @@
<SwitchPreference
android:key="enable_wifi_ap"
android:title="@string/wifi_tether_checkbox_text"
android:title="@string/wifi_hotspot_checkbox_text"
android:summary="@string/summary_two_lines_placeholder" />
<Preference

View File

@@ -19,15 +19,15 @@
<com.android.settings.widget.ValidatedEditTextPreference
android:key="wifi_tether_network_name"
android:title="@string/wifi_ssid"
android:title="@string/wifi_hotspot_name_title"
android:summary="@string/summary_placeholder" />
<com.android.settings.widget.ValidatedEditTextPreference
android:key="wifi_tether_network_password"
android:title="@string/wifi_password" />
android:title="@string/wifi_hotspot_password_title" />
<ListPreference
android:key="wifi_tether_network_ap_band"
android:title="@string/wifi_ap_band_config"
android:title="@string/wifi_hotspot_ap_band_title"
android:summary="@string/summary_placeholder" />
</PreferenceScreen>