Commit Graph

15570 Commits

Author SHA1 Message Date
Doris Ling
362d783a17 Update the initial expanded count for apps and notifications.
- increase it by 1 to accomodate the injected setting.

Change-Id: I0e131c87ffbf2b296b66717b2c6f160abb3b3269
Fixes: 77823915
Test: visual
2018-05-11 14:37:55 -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
Fan Zhang
ea04e32eed Update screen title for lock screen preferences.
Bug: 71892510
Test: visual
Change-Id: I4abe0c2370f10bb68e668c07a033852601b4c2ab
2018-05-11 13:45:02 -07: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
TreeHugger Robot
d43283b53a Merge changes Ic9d1b08c,Id6db9ce2,I7b980218
* changes:
  Add zen starred contacts preference
  Clear deprecated effects when saving zen policy
  DND settings redesign
2018-05-11 20:33:10 +00:00
Ryan Lin
b46389a588 Merge "Add call volume in sound settings" into pi-dev 2018-05-11 20:13:16 +00:00
Lei Yu
938176292f Merge "Remove the padding for VideoPreference" into pi-dev am: d7ebfe3475
am: 8abf13ecc2

Change-Id: I2055a85a26d0f14a862f7993cd77f8fedd2b68be
2018-05-11 12:34:22 -07:00
Fan Zhang
c71d4fc405 Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev am: fe522dc2db
am: 75cbd6d88d

Change-Id: Id5e20cb105f5a3c11648f226f7b46317052353ce
2018-05-11 12:03:38 -07: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
b02c4a18fc Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev am: 4017944d17
am: fe323a7359

Change-Id: I97fe217535a8d9f8da756505c7b60662202a3867
2018-05-11 10:32:40 -07: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
ae2893db10 Update Accessibility vibration settings.
- Get notification vibration and haptic feedback intensity respectively.
- 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 08:56:13 +00:00
hughchen
211d49f28c Add “Rename device” on Bluetooth screen
* Add BluetoothDeviceRenamePreferenceController in bluetooth_screen.xml
* Refactor BluetoothDeviceRenamePreferenceController and BluetoothDeviceNamePreferenceController.
  Let these controllers can be init in xml.

Bug: 78247352
Test: make -j50 RunSettingsRoboTests
Change-Id: Iddd0cac1e973bbd82cb30fe4c18e8b359ba4ba2b
2018-05-11 16:14:43 +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
0e5935f4d6 Merge "Add Pair new device on Bluetooth screen" into pi-dev am: b87eb6aa06
am: c183f43dfe

Change-Id: I94d06345dc2911298b9a45634f989516a0939694
2018-05-10 21:25:34 -07:00
HJ ChangLiao
ee06ef54ca Convert Smart Storage to BasePrefController
Convert Smart Storage (Storage manager) controller:
AutomaticStorageManagementSwitchPreferenceController
to BasePreferenceController for slices

Change-Id: Ieb22cb97cd46a43557dfbdd2c959e87842890fc6
Fixes: 74916013
Test: make RunSettingsRoboTests
2018-05-11 12:25:06 +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
8dc15da1e0 Merge "Add help uri for smart battery page" into pi-dev am: 64135745b9
am: ae09975605

Change-Id: I04595941491f6d2747cbf7c6db03afad166fb6df
2018-05-10 18:14:00 -07: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
Fan Zhang
bfeee279a8 Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev am: 4d6375e052
am: baab651901

Change-Id: I9a024644f81a62bd5cfce912e96bb37320cdab31
2018-05-10 17:44:42 -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
Lei Yu
c6b50f1d77 Merge "Update strings in battery settings." into pi-dev am: faa5c2281e
am: 37a0f5cf7d

Change-Id: I55da31048dd2804198272f8016e135860a5433ee
2018-05-10 16:54:00 -07: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
Beverly
f002dcf43b Add zen starred contacts preference
Bug: 78447976
Test: ZenModeStarredContactsPreferenceControllerTest
Change-Id: Ic9d1b08c3e80832b29ad8e223a34f35e2f763cf9
2018-05-10 18:17:41 -04: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
Julia Reynolds
200da8978f DND settings redesign
Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug: 78447976
2018-05-10 13:25:35 -04: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
hjchangliao
0d1f1d3cd7 Add shorter string for Previously connected device
Original string is too long to show in title bar,
Add a shorter string to avoid clipped.

Change-Id: Ib8b14100f71cb65862036235f290f9f548949b79
Fixes: 78127123
Test: Manual test
2018-05-10 16:18:33 +08: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