PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tether screen cleanup

Browse Source 
- Add a summary placeholder reserving 2 lines for wifi tether pref
- Replace DividerPreference with regular Preference

Change-Id: I2e0c36f27abe2c17625d00d80c816b526f59a6fd
Fix: 37518463
Test: visual
This commit is contained in:
Fan Zhang
2017-05-04 11:28:16 -07:00
parent 31de4c1766
commit d80117dcea
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -2127,6 +2127,9 @@
<string name="sound_settings">Sound</string> <string name="sound_settings">Sound</string>
<!-- DO NOT TRANSLATE Summary placeholder --> <!-- DO NOT TRANSLATE Summary placeholder -->
<string name="summary_placeholder" translatable="false">&#160;</string> <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 --> <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
<string name="summary_empty" translatable="false"></string> <string name="summary_empty" translatable="false"></string>
<!-- Sound settings screen, volume title --> <!-- Sound settings screen, volume title -->

15
res/xml/tether_prefs.xml
View File

@@ -15,7 +15,7 @@
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"> xmlns:settings="http://schemas.android.com/apk/res-auto">
<SwitchPreference <SwitchPreference
android:key="usb_tether_settings" android:key="usb_tether_settings"
@@ -23,7 +23,8 @@
<SwitchPreference <SwitchPreference
android:key="enable_wifi_ap" 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 <Preference
android:key="wifi_ap_ssid_and_security" android:key="wifi_ap_ssid_and_security"
@@ -34,9 +35,9 @@
android:key="enable_bluetooth_tethering" android:key="enable_bluetooth_tethering"
android:title="@string/bluetooth_tether_checkbox_text" /> android:title="@string/bluetooth_tether_checkbox_text" />
<com.android.settings.DividerPreference <Preference
android:key="disabled_on_data_saver" android:key="disabled_on_data_saver"
android:summary="@string/tether_settings_disabled_on_data_saver" android:summary="@string/tether_settings_disabled_on_data_saver"
android:selectable="false" android:selectable="false"
settings:allowDividerAbove="true" /> settings:allowDividerAbove="true" />
</PreferenceScreen> </PreferenceScreen>

1
src/com/android/settings/TetherSettings.java
View File

@@ -37,7 +37,6 @@ import android.os.Handler;
import android.os.UserManager; import android.os.UserManager;
import android.support.v14.preference.SwitchPreference; import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log; import android.util.Log;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;