Merge "Update misc strings" into oc-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
34d30267e3
@@ -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" />
|
||||
|
@@ -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
|
||||
|
@@ -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>
|
Reference in New Issue
Block a user