Commit Graph

2920 Commits

Author SHA1 Message Date
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
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
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
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
cc31240f28 Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev 2018-05-14 18:20:29 +00: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
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
Doris Ling
4af11079e8 Merge "Update the initial expanded count for apps and notifications." into pi-dev 2018-05-11 23:33:36 +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
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
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
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
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
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
TreeHugger Robot
b87eb6aa06 Merge "Add “Pair new device” on Bluetooth screen" into pi-dev 2018-05-11 04:12:53 +00: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
Beverly
f002dcf43b Add zen starred contacts preference
Bug: 78447976
Test: ZenModeStarredContactsPreferenceControllerTest
Change-Id: Ic9d1b08c3e80832b29ad8e223a34f35e2f763cf9
2018-05-10 18:17:41 -04: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
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
android-build-team Robot
37dc457969 Merge "Stop logging tether password in logcat & metrics provider" into pi-dev am: af7d41978c
am: 94907ce4c7

Change-Id: Ieb165e0f0be927f92846bbbce3328576d8a4a1e5
2018-05-08 19:23:39 -07:00
android-build-team Robot
af7d41978c Merge "Stop logging tether password in logcat & metrics provider" into pi-dev 2018-05-09 02:03:03 +00:00
Fan Zhang
9607dde41b Stop logging tether password in logcat & metrics provider
Change-Id: I7aaaf3148445bfb6c556ab37c6577da67dc94cbb
Fixes: 79419591
Test: adb logcat -b events | egrep "(sysui_|notification_)"
2018-05-08 16:31:47 -07:00
Julia Reynolds
e9211d58d2 Merge "DO NOT MERGE DND settings redesign" into pi-dev 2018-05-07 18:25:52 +00:00
Christine Franks
a1c70443be Merge "Add night display pref controllers and change UX" into pi-dev 2018-05-07 18:20:25 +00: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
Christine Franks
77df09244e Add night display pref controllers and change UX
- Convert NightDisplaySettings to a DashboardFragment
- Add preference controllers for all Night Display settings
- Change UX for activation from a toggle to a button

Bug: 73739388
Bug: 69912911
Test: make -j100 and make RunSettingsRoboTests -j100
Change-Id: Ia173f16207ba59bf57eb7546cbb1e2dbca67b063
Merged-In: Ia173f16207ba59bf57eb7546cbb1e2dbca67b063
2018-05-04 09:35:29 -07:00
android-build-team Robot
7309dddaa3 Merge "Refactor badging notification preference controller." into pi-dev 2018-05-04 05:18:34 +00:00
android-build-team Robot
23474e93f1 Merge "Refactor badging notification preference controller." 2018-05-04 04:17:09 +00:00
Chuck Liao
a7c14d474a Refactor badging notification preference controller.
- Convert inheritance from AbstractPreferenceController to TogglePreferenceController.
- Register BadgingNotificationPreferenceController in XML.
- Add RoboTests test cases for BadgingNotificationPreferenceController.

Fixes: 67997784
Test: RunSettingsRoboTests
Change-Id: If10744c067f065e7c2465ca1fff66895d7dc1c56
Merged-In: If10744c067f065e7c2465ca1fff66895d7dc1c56
2018-05-03 09:35:18 +00:00
Chuck Liao
6f4d440414 Refactor badging notification preference controller.
- Convert inheritance from AbstractPreferenceController to TogglePreferenceController.
- Register BadgingNotificationPreferenceController in XML.
- Add RoboTests test cases for BadgingNotificationPreferenceController.

Fixes: 67997784
Test: RunSettingsRoboTests
Change-Id: If10744c067f065e7c2465ca1fff66895d7dc1c56
2018-05-03 16:50:12 +08:00
Christine Franks
d67ec89c4b Add night display pref controllers and change UX
- Convert NightDisplaySettings to a DashboardFragment
- Add preference controllers for all Night Display settings
- Change UX for activation from a toggle to a button

Bug: 73739388
Bug: 69912911
Test: make -j100 and make RunSettingsRoboTests -j100
Change-Id: Ia173f16207ba59bf57eb7546cbb1e2dbca67b063
2018-05-02 13:12:26 -07:00
android-build-team Robot
6451b7b91b Merge "Migrate PaymentSettings to DashboardFragment" 2018-05-01 01:37:34 +00:00
chiujason
ff244c0e40 Migrate PaymentSettings to DashboardFragment
- Move preference related logic to controllers.
- Add some test cases for controllers.

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.nfc
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
      atest SettingsGatewayTest UniquePreferenceTest
Change-Id: I061a194c170f63fab51974f26c24be43d67d6f6f
2018-04-30 17:24:58 -07:00
android-build-team Robot
bf9c07cb59 Merge "Revert "Get rid of charging sounds toggle"" into pi-dev am: 8e55299f98
am: 72cedc72a4

Change-Id: Ib15d341f90072be2fbe3d6b5cb1bfd9c4fcbb938
2018-04-30 14:29:58 -07:00
android-build-team Robot
8e55299f98 Merge "Revert "Get rid of charging sounds toggle"" into pi-dev 2018-04-30 21:08:51 +00:00
Beverly Tai
6761acdd33 Revert "Get rid of charging sounds toggle"
Bug: 77912907
This reverts commit fbe721b1b3.

Reason for revert: negative dogfood feedback

Change-Id: I8485a379eafee0a4fcd599e9b1c47aee7dd3c6ad
2018-04-30 20:01:40 +00:00
android-build-team Robot
167612df0e Merge "Migrate ChooseAccountActivity to DashboardFragment" 2018-04-28 06:10:25 +00:00
Emily Chuang
b279b1c025 Migrate ChooseAccountActivity to DashboardFragment
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.
- Rename to ChooseAccountFragment.

Bug: 73899467
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest
Change-Id: Id2906c4b922ef159d08c803b976671264c54665f
2018-04-27 22:17:23 -07:00
Julia Reynolds
ea360d687d Merge "Redesign zen visual effects screens" into pi-dev 2018-04-27 12:41:58 +00:00