Suprabh Shukla
d47817ffcb
Merge "Unrestricting app when put on power whitelist" into pi-dev
...
am: e70e27ccea
Change-Id: If9e91bde1f531a004b440a66eede2c93a565c2df
2018-05-11 16:22:15 -07:00
Lei Yu
b8cfe7fff0
Merge "Add help uri for restricted apps page" into pi-dev
...
am: f4c8a4cdf5
Change-Id: Ie642041ddcc57396cbf38e46657b2a8400a3168e
2018-05-11 16:20:23 -07:00
TreeHugger Robot
e70e27ccea
Merge "Unrestricting app when put on power whitelist" into pi-dev
2018-05-11 23:06:49 +00:00
Lei Yu
f4c8a4cdf5
Merge "Add help uri for restricted apps page" into pi-dev
2018-05-11 23:05:41 +00:00
Fan Zhang
326ff3dbe1
Add help uri for restricted apps page
...
Bug: 77299457
Test: Build
Change-Id: I46c208f9805f47a4f42e44338ea5dce0451dd671
2018-05-11 14:56:49 -07:00
Beverly Tai
e493237128
Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev
...
am: 49499bcb06
Change-Id: I240e2722ab936742fb58ca96fe4bad13195aa21e
2018-05-11 14:10:11 -07:00
Suprabh Shukla
0f447022cf
Unrestricting app when put on power whitelist
...
Power whitelisting and background restrictions are opposing rules, so to
keep apps out of confusing states, unrestricting an app whenever it is
put on the power whitelist.
Test: atest RunSettingsRoboTests:HighPowerDetailTest
Bug: 77924141
Change-Id: I4952ac6c893bc7e98aa1b6ad3a86906fc299dea5
2018-05-11 14:00:28 -07:00
Beverly Tai
49499bcb06
Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev
2018-05-11 20:59:49 +00:00
Beverly
d4e7eedfc9
DO NOT MERGE Add DND Settings suggestion
...
Test: SettingsSuggestionsTest, ZenOnboardingActivityTest
Change-Id: Ie78c9cf8287ee56bc4596efe20d27f8eb432ab6c
Bug: 78445134
2018-05-11 20:59:38 +00:00
Ryan Lin
71b333f162
Merge "Add call volume in sound settings" into pi-dev
...
am: b46389a588
Change-Id: I38c7fbede3a758440c9d4ce0a7aa0b3999719cec
2018-05-11 13:36:20 -07:00
Ryan Lin
b46389a588
Merge "Add call volume in sound settings" into pi-dev
2018-05-11 20:13:16 +00:00
Lei Yu
8abf13ecc2
Merge "Remove the padding for VideoPreference" into pi-dev
...
am: d7ebfe3475
Change-Id: Ia6bde79679965769516f40134b5dd58fac645ca6
2018-05-11 11:57:05 -07:00
Fan Zhang
75cbd6d88d
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
...
am: fe522dc2db
Change-Id: I380123375af5eed570915472d4ae34402d6af006
2018-05-11 11:38:31 -07:00
TreeHugger Robot
d7ebfe3475
Merge "Remove the padding for VideoPreference" into pi-dev
2018-05-11 18:13:48 +00:00
Fan Zhang
fe522dc2db
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
2018-05-11 18:02:22 +00:00
timhypeng
fe323a7359
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev
...
am: 4017944d17
Change-Id: I7eefdbbc9ff9a1892b3309c4d284d2358d589b0f
2018-05-11 10:21:55 -07:00
TreeHugger Robot
4017944d17
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev
2018-05-11 17:02:08 +00:00
ryanywlin
156fd91fbd
Add call volume in sound settings
...
* Add call volume slider
* move "Take call" controller from "Ring volume" to "Call volume"
Bug: 77254162
Test: make -j50 RunSettingsRoboTests
Change-Id: I3443021c1557f42293e9b7772fe9072e5a966cf8
2018-05-11 17:56:16 +08:00
AL HO
d507ddd71c
Merge "Update Accessbility vibration settings." into pi-dev
...
am: 204dcfdb4c
Change-Id: I946902304191ca136cdb960683cdf742cb8ff9a3
2018-05-11 00:23:51 -07:00
AL HO
204dcfdb4c
Merge "Update Accessbility vibration settings." into pi-dev
2018-05-11 07:11:14 +00:00
timhypeng
86b5ade6e2
Add discoverable footer preference string when bluetooth is off
...
Bug: 79294219
Test: build pass
Change-Id: Iea8c75bed099466060405d81b793404619059642
2018-05-11 14:16:35 +08:00
hughchen
c183f43dfe
Merge "Add Pair new device on Bluetooth screen" into pi-dev
...
am: b87eb6aa06
Change-Id: I4ca53abcb7bb28cafc8b7527c82a97f6b70545f8
2018-05-10 21:20:59 -07:00
TreeHugger Robot
b87eb6aa06
Merge "Add “Pair new device” on Bluetooth screen" into pi-dev
2018-05-11 04:12:53 +00:00
AL Ho
92216ae148
Update Accessbility vibration settings.
...
- Get notification vibration and haptic feedback intensity repectively.
- Use xliffs to compose these strings.
- Use the version that passed in Vibrator.class to get Vibrator
instance.
- Refactor switch/case part in getSummary() of
VibrationIntensityPreferenceController.
Let AccessibilitySettings and VibrationIntensityPreferenceController
both call it.
- Add robolectric test for method: updateVibrationSummary().
- Refine test method, use real preference and test summary value.
- Remove redundancy.
Bug: 75322064
Test: make ROBOTEST_FILTER=AccessibilitySettingsTest RunSettingsRoboTests
Change-Id: Ia3c7447b1ab1e336b36ad439800b673821417e48
Merged-In: Ia3c7447b1ab1e336b36ad439800b673821417e48
2018-05-11 11:13:25 +08:00
hughchen
15c7f76101
Add “Pair new device” on Bluetooth screen
...
* Add AddDevicePreferenceController in bluetooth_screen.xml
Bug: 79298886
Test: make -j50 RunSettingsRoboTests
Change-Id: I4e43e31d05c297ca206cd2b0f747bb615c3dfcd4
2018-05-11 10:25:46 +08:00
timhypeng
6f70289b25
Update string from "Add device" to "Pair new device" in Setting > Connected devices
...
* Replace string ID from "connected_device_add_device_title" to "bluetooth_pairing_pref_title" in Connected devices
* Reuse ID and change string "Add device" back
* BACKUP_MESSAGE_ID=7803521577708810621
Bug: 79298885
Test: make -j50 RunSettingsRoboTests
Change-Id: I29f72002c0ece4981d5a523c8649a78acb80730d
2018-05-11 10:01:36 +08:00
Lei Yu
c1ec772399
Remove the padding for VideoPreference
...
In old days, VideoPreference has special padding in landscape and no
padding in protrait. This CL removes the padding dimen entirely.
Change-Id: Ic0ecd27cf7e200bd8fda58a37643482f146793a8
Fixes: 79543761
Test: Screenshot
2018-05-10 17:51:52 -07:00
Lei Yu
ae09975605
Merge "Add help uri for smart battery page" into pi-dev
...
am: 64135745b9
Change-Id: I85102ee5824c2b8e52b638cee17334fe65132c9f
2018-05-10 17:34:01 -07:00
TreeHugger Robot
64135745b9
Merge "Add help uri for smart battery page" into pi-dev
2018-05-11 00:12:31 +00:00
Fan Zhang
baab651901
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev
...
am: 4d6375e052
Change-Id: I08afa778d2a7a6af1cbcf3493077c964caa8d5c1
2018-05-10 16:36:58 -07:00
TreeHugger Robot
4d6375e052
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev
2018-05-10 23:29:03 +00:00
Fan Zhang
dc00efa666
Use shorter string for MasterClear to stop truncating title
...
Change-Id: Ic1c639724c06d4671d4703b9862e77f673541f77
Fixes: 77904702
Test: visual
2018-05-10 15:19:12 -07:00
Lei Yu
37a0f5cf7d
Merge "Update strings in battery settings." into pi-dev
...
am: faa5c2281e
Change-Id: I0196ea02f6e3ca9ff533feae1942540daa35e0c2
2018-05-10 14:51:03 -07:00
TreeHugger Robot
faa5c2281e
Merge "Update strings in battery settings." into pi-dev
2018-05-10 21:28:31 +00:00
Lei Yu
fd37f240a9
Add help uri for smart battery page
...
Bug: 77299457
Test: Build
Change-Id: I3d0ba355e0ded6f830eddd501f57af601c0b33c7
2018-05-10 13:25:06 -07:00
Lei Yu
bc54cedabd
Update strings in battery settings.
...
1. Message in high usage dialog
2. Title in app usage list
Change-Id: Iac610483e10e8d2a93a18ca664aec17d9561aaf8
Fixes: 78638843
Test: RunSettingsRoboTests
2018-05-10 11:31:29 -07:00
Beverly Tai
c93a0dc2fb
Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev
...
am: 60a9ed8627
Change-Id: I9a16629067a76f2113c6ed312796aa47dda7f649
2018-05-10 06:35:13 -07:00
Beverly Tai
60a9ed8627
Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev
2018-05-10 13:28:47 +00:00
Mehdi Alizadeh
85833473e1
Merge changes from topic "swipe-up-gesture-overlay" into pi-dev
...
am: 3167f72961
Change-Id: Iac284f04b0ba862064ea5d2822819eaf31dcb4c0
2018-05-09 20:09:15 -07:00
Mehdi Alizadeh
c93a97d9d5
Adds two overlay settings fields for Swipe Up gesture
...
Adds two overlay settings for Swipe Up gesture, one for the default
value (enabled/disabled), and another one to show/hide the Swipe Up
settings page in Settings app.
Bug: 78908915
Bug: 78641268
Test: Robotests and Manual test
Change-Id: If7bea967f3af9ebe96ab87e8a4d6d05c5daa4ed5
2018-05-09 18:44:42 -07:00
Lei Yu
1f429286d2
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
...
am: 1dbe185db2
Change-Id: I14a5de9f360b11de52ecda509fcdeca11d1af0a2
2018-05-09 15:08:09 -07:00
TreeHugger Robot
1dbe185db2
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
2018-05-09 21:54:26 +00:00
Andreas Terzis
aee672badc
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev
...
am: b5de55fbfc
Change-Id: Ic31625e5eab080bdb007d85803b2f9eebe430dbf
2018-05-09 14:31:06 -07:00
Andreas Terzis
b5de55fbfc
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev
2018-05-09 21:15:43 +00:00
Beverly
a4d5980869
DO NOT MERGE Add zen starred contacts preference
...
Bug: 78447976
Test: ZenModeStarredContactsPreferenceControllerTest
Change-Id: Ic9d1b08c3e80832b29ad8e223a34f35e2f763cf9
2018-05-09 16:12:10 -04:00
Andreas Terzis
3fed7fb0e2
Increase the char limit of carrier_and_update_text to 32.
...
The translation of the carrier_and_update_text field
in some European languages requires 32 characters. To
accomodate these requirements increase the character
limit from 30 to 32.
Also, set the field to wrap since the name of the
carrier can be long.
Bug: 76443795
Test: manual
Change-Id: Ic4c3ed0736af0535734590340e9631108707da73
2018-05-09 12:12:01 -07:00
Lei Yu
d0ca222d9a
Use WRAP_CONTENT for battery saver button
...
Change-Id: Id1d417021eff56c3733f6711f121085ad67ae3da
Fixes: 79256447
Test: Screenshot
2018-05-09 10:44:23 -07:00
android-build-team Robot
9a1d318b37
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-05-09 03:56:36 +00:00
android-build-team Robot
3f40c15294
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
...
am: f4dd526f70
Change-Id: Iac7db28e7b22f49280e09974a73310061fb01afd
2018-05-08 19:46:35 -07:00
android-build-team Robot
f4dd526f70
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
2018-05-09 02:36:26 +00:00