Commit Graph

4787 Commits

Author SHA1 Message Date
Suprabh Shukla
a8eb28f219 Merge "Unrestricting app when put on power whitelist" into pi-dev am: e70e27ccea
am: d47817ffcb

Change-Id: I488c11a04f7350c96c71ca70d1122c7de7b27833
2018-05-11 17:00:22 -07:00
Lei Yu
a01cefad2e Merge "Add help uri for restricted apps page" into pi-dev am: f4c8a4cdf5
am: b8cfe7fff0

Change-Id: If67adaca3f1bfeada9317c48e32faa6f08dc0fc1
2018-05-11 16:44:09 -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
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
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
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
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
TreeHugger Robot
4017944d17 Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev 2018-05-11 17:02:08 +00: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
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
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
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
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
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
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
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
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
Andreas Terzis
72e5c02bf1 Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev am: b5de55fbfc
am: aee672badc

Change-Id: Idaa745faed1e8a9aaaac10ecb255374caa624f65
2018-05-09 14:37:35 -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
android-build-team Robot
11c3af70e1 Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev am: f4dd526f70
am: 3f40c15294

Change-Id: I169db327d5e07732e45164510244f320787339b0
2018-05-08 19:51:43 -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
android-build-team Robot
ea2bace446 Merge "Update strings for summary tip." into pi-dev am: 0e7cff80ef
am: 171ec14458

Change-Id: I564c2f2099bfba4ba9a8327d7b426365bb4f7bd9
2018-05-08 17:57:04 -07:00
android-build-team Robot
0e7cff80ef Merge "Update strings for summary tip." into pi-dev 2018-05-09 00:44:18 +00:00
android-build-team Robot
218dff6173 Merge "Add back up message id for "Action not allowed"." into pi-dev am: c0edff7ffd
am: 4b118a3788

Change-Id: I29355e24dad7179c5cf430e860f6176cddcf42df
2018-05-08 16:27:38 -07:00
Lei Yu
adddc30c64 Update strings for summary tip.
1. Strings for the tip preference
2. Strings for the tip dialog

Change-Id: I59c371328ec735a0b22f707d440f3be85cf59c77
Fixes: 79171948
Test: Manual & RunSettingsRoboTests
2018-05-08 15:46:07 -07:00
yuemingw
3da2118260 Add back up message id for "Action not allowed".
Bug: 78443458
Test: manual
Change-Id: Ib93d8bf767be36323515ecb7cf496a6c234c06fe
2018-05-08 22:41:26 +01:00
android-build-team Robot
714b15cbdf Merge "Use ListFormatter to join strings" 2018-05-08 20:20:28 +00:00
android-build-team Robot
1220c364c4 Merge "Update Support and Tips setting title." into pi-dev am: e30007dcc0
am: 2cc1168d39

Change-Id: I9eeb3e34b88a9ff4fba7cda514d4f3f2f0dceafa
2018-05-07 12:20:56 -07:00
android-build-team Robot
e30007dcc0 Merge "Update Support and Tips setting title." into pi-dev 2018-05-07 19:06:27 +00:00
Doris Ling
3b0b677194 Update Support and Tips setting title.
- change to Tips and support.

Change-Id: Ie4f7a7cd238686316de52bc8641fde863ea82fe8
Fixes: 79164716
Test: rebuild
2018-05-07 11:04:23 -07:00
timhypeng
2184aaf444 Update string from "Add device" to "Pair new device" in Setting > Connected devices
Bug: 79298886
Test: make -j50 RunSettingsRoboTests
Change-Id: I172aa867c85532912a06d52ca773f840d25647ec
2018-05-07 16:30:36 +08:00
Julia Reynolds
cb6fe394d0 DO NOT MERGE DND settings redesign
Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug: 78447976
2018-05-04 14:45:43 -04:00
android-build-team Robot
89f4eff417 Merge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev am: 9b29aeba5a
am: da8fd0d757

Change-Id: I4accda37f334988c561d0801acef145e513c951c
2018-05-03 17:26:55 -07:00