Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52836c21 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Tether screen cleanup"

parents 3dea2a96 d80117dc

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -2127,6 +2127,9 @@ 
    <string name="sound_settings">Sound</string>

    <!-- DO NOT TRANSLATE Summary placeholder -->

    <string name="summary_placeholder" translatable="false">&#160;</string>

    <!-- DO NOT TRANSLATE Summary placeholder reserving 2 lines -->

    <string name="summary_two_lines_placeholder" translatable="false">&#160;\n&#160;</string>









    <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->









    <string name="summary_empty" translatable="false"></string>









    <!-- Sound settings screen, volume title -->
































res/xml/tether_prefs.xml



+8
−7






























Original line number
Diff line number
Diff line







@@ -23,7 +23,8 @@

















    <SwitchPreference









        android:key="enable_wifi_ap"









        android:title="@string/wifi_tether_checkbox_text" />









        android:title="@string/wifi_tether_checkbox_text"









        android:summary="@string/summary_two_lines_placeholder" />



















    <Preference









        android:key="wifi_ap_ssid_and_security"








@@ -34,7 +35,7 @@







        android:key="enable_bluetooth_tethering"









        android:title="@string/bluetooth_tether_checkbox_text" />



















    <com.android.settings.DividerPreference









    <Preference









        android:key="disabled_on_data_saver"









        android:summary="@string/tether_settings_disabled_on_data_saver"









        android:selectable="false"
































src/com/android/settings/TetherSettings.java



+0
−1






























Original line number
Diff line number
Diff line







@@ -37,7 +37,6 @@ import android.os.Handler;







import android.os.UserManager;









import android.support.v14.preference.SwitchPreference;









import android.support.v7.preference.Preference;









import android.support.v7.preference.PreferenceScreen;









import android.util.Log;



















import com.android.internal.logging.nano.MetricsProto.MetricsEvent;