Commit Graph

15205 Commits

Author SHA1 Message Date
Lei Yu
ae9a1d15e1 Merge "Add string for disabled FAS toggle." into pi-dev am: cbf68188ff
am: ca5296446d

Change-Id: Ida55ab074d37aebf34718e556d0075404c98e4c0
2018-05-14 20:19:11 -07:00
Lei Yu
ca5296446d Merge "Add string for disabled FAS toggle." into pi-dev
am: cbf68188ff

Change-Id: If82cb65870b876462d9aff7cd5630db8186129cb
2018-05-14 20:15:11 -07:00
TreeHugger Robot
cbf68188ff Merge "Add string for disabled FAS toggle." into pi-dev 2018-05-15 03:09:19 +00:00
Lei Yu
dae3c912d7 Add string for disabled FAS toggle.
If FAS toggle is disabled because app is in doze whitelist(not optimized), show
a dialog that has this string.

Bug: 77924141
Test: Manual
Change-Id: I30518cd887125bff00b7c567e26204d5b1814858
2018-05-14 17:55:21 -07:00
Naina Nalluri
86818604ac Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev
am: 15602b3f48

Change-Id: I8e8db64e099f0fc06363b1c91c0108285e025e45
2018-05-14 16:12:42 -07:00
Naina Nalluri
15602b3f48 Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev 2018-05-14 22:59:11 +00:00
Lei Yu
7c580997be Merge "Add cancel button for private dns dialog" into pi-dev am: 7fe599f542
am: ea1d9d17d1

Change-Id: I55cab617105d21ff42ed911e6b457ec662349811
2018-05-14 15:11:36 -07:00
Lei Yu
ea1d9d17d1 Merge "Add cancel button for private dns dialog" into pi-dev
am: 7fe599f542

Change-Id: I7a866a68c27503f174b7aa4fa3101264c9174ff5
2018-05-14 14:53:37 -07:00
TreeHugger Robot
7fe599f542 Merge "Add cancel button for private dns dialog" into pi-dev 2018-05-14 21:29:09 +00:00
Beverly Tai
044213b8ca Merge "Always show custom zen vis eff option" 2018-05-14 20:23:31 +00:00
Naina Nalluri
e6bf71abed DO NOT MERGE Add Slices for WifiCalling
Add Slices for WifiCalling
WifiCalling Slice Provider:
  1. If there is no activation needed or if the Wifi calling
     is currently turned on - provide the slice to toggle the
     value
  2. Else display appropriate message with further instructions
WifiCalling Slice Broadcast Receiver:
  1. If the action is turning off wifi or if there is no
     activation needed. Change the setting with ImsManager.
  2. And Ask to requery the slice in one second to display
     updated settings if 1 is valid or display appropriate message

Bug: 63731862
Bug: 78192106
Test: Use support-slices-demos-debug.apk to test on device
Test: Robotests
Change-Id: I29e1822fd24ebcff575fa48ad93f84ed91bf4d87
2018-05-14 20:16:01 +00:00
Lei Yu
231fe615cc Add cancel button for private dns dialog
Also update the onclick method.

Change-Id: I69e92584e056a4d0a686153315b8df002d91e204
Fixes: 79479021
Test: RunSettingsRoboTests
2018-05-14 13:12:00 -07:00
TreeHugger Robot
3d6d739b0e Merge "Slices feature supports device model." 2018-05-14 20:07:06 +00:00
TreeHugger Robot
8b623afc72 Merge "Add DND Settings suggestion" 2018-05-14 19:21:31 +00:00
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
Beverly
55d6aebcc5 Always show custom zen vis eff option
Cherry-picked from pi-dev ag/4044915
+ dnd string edits

Change-Id: I2fcbe6c527b40610f997efacb08049c07b3a6dd7
Fixes: 79538038
Bug: 78447976
Test: ZenModeViseffectsCustomPreferenceControllerTes
2018-05-14 19:03:40 +00:00
TreeHugger Robot
b5d4138a81 Merge "Add Slices for WifiCalling" 2018-05-14 18:48:42 +00:00
Hansong Zhang
d27f2a4d03 Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev
am: cc31240f28

Change-Id: I756e4f218f9b593e0329c06fc1663c1833ffa389
2018-05-14 11:28:35 -07:00
TreeHugger Robot
cc31240f28 Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev 2018-05-14 18:20:29 +00:00
Beverly
8f52258962 Add DND Settings suggestion
Cherry-picked from pi-dev ag/4019736

Test: SettingsSuggestionsTest, ZenOnboardingActivityTest
Change-Id: Ie78c9cf8287ee56bc4596efe20d27f8eb432ab6c
Bug: 78445134
2018-05-14 18:15:29 +00:00
Naina Nalluri
6885d85a7c Add Slices for WifiCalling
Add Slices for WifiCalling
WifiCalling Slice Provider:
  1. If there is no activation needed or if the Wifi calling
     is currently turned on - provide the slice to toggle the
     value
  2. Else display appropriate message with further instructions
WifiCalling Slice Broadcast Receiver:
  1. If the action is turning off wifi or if there is no
     activation needed. Change the setting with ImsManager.
  2. And Ask to requery the slice in one second to display
     updated settings if 1 is valid or display appropriate message

Bug: 63731862
Bug: 78192106
Test: Use support-slices-demos-debug.apk to test on device
Test: Robotests
Change-Id: I29e1822fd24ebcff575fa48ad93f84ed91bf4d87
2018-05-14 10:19:15 -07:00
Beverly
65251dd8eb Merge "DO NOT MERGE Always show custom zen vis eff option" into pi-dev
am: 8e27fc7583

Change-Id: I42fbcfcf6073722656cc9186f83c3fee6bbc2777
2018-05-14 08:38:10 -07:00
TreeHugger Robot
8e27fc7583 Merge "DO NOT MERGE Always show custom zen vis eff option" into pi-dev 2018-05-14 15:29:12 +00:00
Beverly
f487cb9e0a DO NOT MERGE Always show custom zen vis eff option
+ dnd string edits

Change-Id: I2fcbe6c527b40610f997efacb08049c07b3a6dd7
Bug: 79538038
Bug: 78447976
Test: ZenModeViseffectsCustomPreferenceControllerTest
2018-05-14 14:39:32 +00:00
Bill Yi
9c5d8fdc5a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ide496214e78fbc4bdbd606ecff720a8cf988daa5
2018-05-12 12:16:11 -07:00
Hansong Zhang
e8cb916849 Remove developer menu: AVDTP delay reports/inband ringing
Bluetooth AVDTP delay reports and inband ringing are used by default.
Developer option menu no longer used.

Bug: 79610154
Test: robolectric
Change-Id: I67fe10808151f101fc7e891f75953f8539255026
2018-05-12 00:22:21 +00:00
Hansong Zhang
f4f68c4117 Remove developer menu: AVDTP delay reports/inband ringing
Bluetooth AVDTP delay reports and inband ringing are used by default.
Developer option menu no longer used.

Bug: 79610154
Test: robolectric
Change-Id: I67fe10808151f101fc7e891f75953f8539255026
Merged-In: I67fe10808151f101fc7e891f75953f8539255026
2018-05-12 00:22:16 +00:00
Doris Ling
b9a3b0c490 Merge "Update the initial expanded count for apps and notifications." into pi-dev am: 4af11079e8
am: b422264d55

Change-Id: I35998f28e12d542ce8a7d835fce8a433cdbf12fc
2018-05-11 17:17:47 -07:00
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
Doris Ling
b422264d55 Merge "Update the initial expanded count for apps and notifications." into pi-dev
am: 4af11079e8

Change-Id: Idcced54ab4b705257d5c24a416c078cf24d33b30
2018-05-11 16:50:15 -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
Doris Ling
4af11079e8 Merge "Update the initial expanded count for apps and notifications." into pi-dev 2018-05-11 23:33:36 +00:00
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
Ryan Lin
18aa25ea47 Merge "Add call volume in sound settings" into pi-dev am: b46389a588
am: 71b333f162

Change-Id: If69203fa5c4158f609484e6c3bbc0ca5bd6e0f58
2018-05-11 15:44:53 -07: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
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