Commit Graph

45678 Commits

Author SHA1 Message Date
tmfang
5c467566f1 Slices feature supports device model.
- Migrate DeviceModelPreferenceController to BasePreferenceController
- Because Slice feature enables strict mode,
  we can't do I/O(DeviceInfoUtils.getMsvSuffix) on main thread.

  Using FutureTask to get around the foreground thread restriction.

- Modify test case for new device model controller.

Test: slice uri > content://android.settings.slices/intent/my_device_model
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest

Change-Id: Idafc132dfa14138ad5a7edd58e63c4b0f644c994
2018-05-14 12:06:47 -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
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
TreeHugger Robot
1f0ff7214c Merge "Make local variables final where possible in CredentialStorage" 2018-05-11 19:03:21 +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
Todd Kennedy
4fa4eeb675 Merge "OMS: rebase settings when overlays update" into pi-dev am: 203b7b1792
am: 45d58cab2c

Change-Id: Iab503a1196a7412d101e4c5c7831785bf5fd18bb
2018-05-11 11:53:09 -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
Irina Dumitrescu
ea8406f75d Make local variables final where possible in CredentialStorage
This speeds up the run-time of credential settings.
Test: this is tested at compile time.

Change-Id: I77d577cace07826596eb40223a36a8d327b3d72b
2018-05-11 19:08:01 +01: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
Todd Kennedy
45d58cab2c Merge "OMS: rebase settings when overlays update" into pi-dev
am: 203b7b1792

Change-Id: Icc4933994802079f96bc2b170d9167688b2939d9
2018-05-11 11:00:07 -07:00
Todd Kennedy
203b7b1792 Merge "OMS: rebase settings when overlays update" into pi-dev 2018-05-11 17:44:53 +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
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
bf180cd6a9 [automerger skipped] Merge "Update Accessbility vibration settings." into pi-dev am: 204dcfdb4c
am: d507ddd71c  -s ours

Change-Id: Ia7063753b264c4baa9e3cf329a432419e8d05e76
2018-05-11 00:55:53 -07: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
Fan Zhang
446b699fc3 [automerger skipped] Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev am: 9e629edb09
am: b76c1ba682  -s ours

Change-Id: I52c4160b9f2e5c713c0174b2e27e475b3ea44f31
2018-05-10 23:04:02 -07:00
Fan Zhang
b76c1ba682 Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev
am: 9e629edb09

Change-Id: Ibab3710f94c418dd345b76fb4d2fd3f486b8c499
2018-05-10 22:59:31 -07:00
TreeHugger Robot
9e629edb09 Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev 2018-05-11 05:49:29 +00:00
TreeHugger Robot
8c71d3853f Merge "Fix a strict mode violation in SystemUpdatePrefController" 2018-05-11 04:46:53 +00: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
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
Fan Zhang
93d3b5174d Fix a strict mode violation in SystemUpdatePrefController
Change-Id: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Bug: 78626509
Test: robotests
2018-05-11 03:45:48 +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
90e7041170 Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev am: b98039e263
am: 5740dd8604

Change-Id: I0b982809ccb0419b5773fb05c9b59f402dbbcbee
2018-05-10 18:26:48 -07:00
Doris Ling
56df32dc0b Merge "Map the new category keys to the corresponding fragment." into pi-dev am: be5fa599be
am: b04528670b

Change-Id: I44e1cc9b2e631b19bb51079230821d5e59f496ec
2018-05-10 18:14:54 -07: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
5740dd8604 Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev
am: b98039e263

Change-Id: Ie12a079ea1ab083772d3b6c08d2db51157a9315b
2018-05-10 18:05:59 -07:00
Doris Ling
b04528670b Merge "Map the new category keys to the corresponding fragment." into pi-dev
am: be5fa599be

Change-Id: Ie55eee4ac77b9ce9be5f9d1ff3a0bb769fb2f5b9
2018-05-10 18:03:05 -07:00
Fan Zhang
4e24b3ffde [automerger skipped] Merge "Remove search option in Magnification settings" into pi-dev am: f9b93310c5
am: ecd3b2da54  -s ours

Change-Id: I99a647a6f5b29093ce64be9c19622a3bde10a359
2018-05-10 18:02:38 -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
Lei Yu
b98039e263 Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev 2018-05-11 00:49:22 +00:00
TreeHugger Robot
be5fa599be Merge "Map the new category keys to the corresponding fragment." into pi-dev 2018-05-11 00:46:42 +00: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
Fan Zhang
4ca363470b Fix a strict mode violation in SystemUpdatePrefController
Change-Id: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Merged-In: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Fixes: 78626509
Test: robotests
2018-05-11 00:32:01 +00:00
Lei Yu
1ac4967311 Merge "Add action for low battery tip" into pi-dev am: ed7101cd2a
am: c051396951

Change-Id: If2fee93c5ab5ba96fb843b11633f5704043b3067
2018-05-10 17:25:45 -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
ecd3b2da54 Merge "Remove search option in Magnification settings" into pi-dev
am: f9b93310c5

Change-Id: I626e6ebf41395938abf74f004612e982a0ed8005
2018-05-10 17:01:45 -07:00
Fan Zhang
f9b93310c5 Merge "Remove search option in Magnification settings" into pi-dev 2018-05-10 23:56:02 +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
a3d991cc0c Merge "Make it so client code does not tie tether to wifi" 2018-05-10 23:44:01 +00:00