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

Merge changes from topic 'two_target_preference'

Browse Source 
* changes:
  Update string character limit
  Convert BT preference to use TwoTargetPreference
  Refactor the layout for MasterSwitch to a 2 target pref
This commit is contained in:
TreeHugger Robot
2017-03-23 01:26:47 +00:00
committed by Android (Google) Code Review
parent 07328d3983 5ae37599b4
commit b0967c8287
16 changed files with 185 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -222,8 +222,6 @@
<string name="bluetooth_devices">Bluetooth devices</string>
<!-- Bluetooth settings screen, title for the current bluetooth name setting -->
<string name="bluetooth_device_name">Device name</string>
<!-- Bluetooth settings screen, image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
<string name="bluetooth_device_details">Device settings</string>
<!-- Bluetooth settings screen, image description for profile of a device details button. -->
<string name="bluetooth_profile_details">Profile settings</string>
<!-- Bluetooth settings screen, summary text when there isn't a name set (for the name setting) -->
@@ -7598,7 +7596,7 @@
<!-- Summary of condition that battery saver is on [CHAR LIMIT=NONE] -->
<string name="condition_battery_summary">Performance is reduced. Location services and background data are turned off.</string>
<!-- Title of condition that cellular data is off [CHAR LIMIT=30] -->
<!-- Title of condition that cellular data is off [CHAR LIMIT=50] -->
<string name="condition_cellular_title">Mobile data is off</string>
<!-- Summary of condition that cellular data is off [CHAR LIMIT=NONE] -->