Commit Graph

2976 Commits

Author SHA1 Message Date
Jayachandran C
127bfcfe2d Remove connectivity monitor switch from developer options
Test: Verify connectivity monitor switch is no more shown
      under developer options

Bug: 79255514
Change-Id: I755885398b92a726b0b979815c33793abe01ea66
2018-05-22 13:24:33 -07:00
Julia Reynolds
b98f69c89a Merge "Fix field reordering on toggle switch" into pi-dev am: 8eac6665e8
am: 4bc1985a8c

Change-Id: I8db22efc4042ee91c2a3fbb3d6bfc632a91344b3
2018-05-22 09:24:48 -07:00
Julia Reynolds
a65cec7b9a Fix field reordering on toggle switch
Every field needs an explicit order.

Test: manual
Change-Id: Iae533db9e9d240bd0dc14da04a1831fe23005f9e
Fixes: 79749266
2018-05-22 14:20:58 +00:00
Matthew Fritze
a7aab5d7a2 Merge "Change Night Display slice title to "NightDisplay"" into pi-dev am: fbe8e0f11e
am: 29365aa2e7

Change-Id: Ifbe37d928fa60f560adbb971a07bb699b9777bab
2018-05-21 14:49:39 -07:00
TreeHugger Robot
fbe8e0f11e Merge "Change Night Display slice title to "NightDisplay"" into pi-dev 2018-05-21 21:37:38 +00:00
Matthew Fritze
6394a1425c Change Night Display slice title to "NightDisplay"
Fixes: 80093098
Test: Slice browser for UI change
Change-Id: I4999d375f76d914095d4af234aaeb31e32fe798f
2018-05-21 20:52:15 +00:00
Chienyuan
c96606500f Add developer options toggle for Bluetooth A2DP hardware offload
Bug: 63932139
Bug: 79568680
Test: robotests
Change-Id: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
Merged-In: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
2018-05-18 23:40:22 -07:00
Chienyuan
ea14ef88ee Add developer options toggle for Bluetooth A2DP hardware offload
Bug: 63932139
Bug: 79568680
Test: robotests
Change-Id: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
2018-05-18 23:12:28 -07:00
TreeHugger Robot
0e721c598e Merge "Make user explicitly set security type for tether network" into pi-dev 2018-05-19 03:17:17 +00:00
Salvador Martinez
d9bae5a15e Make user explicitly set security type for tether network
This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.

Test: robotests
Fixes: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
Merged-In: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
2018-05-19 02:14:18 +00:00
TreeHugger Robot
2835348b72 Merge "Make user explicitly set security type for tether network" 2018-05-19 02:05:20 +00:00
TreeHugger Robot
871d93a564 Merge "Settings: Add logical camera default switch" into pi-dev 2018-05-19 01:27:11 +00:00
TreeHugger Robot
863b27270d Merge "Add controller to show the summary" into pi-dev 2018-05-19 01:26:12 +00:00
Shuzhen Wang
a9578a2b8a Settings: Add logical camera default switch
Add a switch to make logical camera as default camera (with smaller
camera id) for 3rd party app.

Test: Manually using Settings app, RunSettingsRoboTests
Bug: 77600932
Change-Id: I86c7f3b9830fb376b324621feb31cdfac59faee5
Merged-In: I86c7f3b9830fb376b324621feb31cdfac59faee5
2018-05-18 23:01:03 +00:00
TreeHugger Robot
f5e52c421b Merge "Settings: Add logical camera default switch" 2018-05-18 22:58:35 +00:00
Salvador Martinez
f3d532f43d Make user explicitly set security type for tether network
This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.

Test: robotests
Bug: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
2018-05-18 15:21:07 -07:00
Antony Sargent
28f04c984d Merge "Updated delete icon" into pi-dev am: 55642ef91b
am: d55b214dbd

Change-Id: Ifca325273ca5e99461a93487b127b5d0adcf6a39
2018-05-18 14:52:44 -07:00
TreeHugger Robot
55642ef91b Merge "Updated delete icon" into pi-dev 2018-05-18 21:38:51 +00:00
Shuzhen Wang
5aab8d9ee1 Settings: Add logical camera default switch
Add a switch to make logical camera as default camera (with smaller
camera id) for 3rd party app.

Test: Manually using Settings app, RunSettingsRoboTests
Bug: 77600932
Change-Id: I86c7f3b9830fb376b324621feb31cdfac59faee5
2018-05-18 14:09:00 -07:00
hughchen
c24a09e593 Add controller to show the summary
* For fix the "Automatic merge failed" in pi-dev, cherry pick the ag/4036738 in
  master. Change android.support.* to androidx.*
* Add AdvancedConnectedDeviceController that used to show which component is available
* Add getConnectedDevices Summary Resource Id() to decide which string should be shown.
  Here have  4 cases to shown the string.
  case 1: driving mode available and NFC is availalbe, show "Bluetooth, driving mode, NFC"
  case 2: driving mode available and NFC is not availalbe, show "Bluetooth, driving mode"
  case 3: driving mode not available and NFC is availalbe, show "Bluetooth, NFC"
  case 4: driving mode not available and NFC not availalbe, show "Bluetooth"
* Add test to verify the summary string is correct in each condition
* Add test to verify getAvailabilityStatus() is AVAILABLE.

Bug: 79299421
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest
Change-Id: I1048355bbd344db3ab645dd1537b4259eff57f38
2018-05-18 18:17:43 +00:00
hughchen
fd7c9650ed Add controller to show the summary
* Add AdvancedConnectedDeviceController that used to show which component is available
* Add getConnectedDevices Summary Resource Id() to decide which string should be shown.
  Here have  4 cases to shown the string.
  case 1: driving mode available and NFC is availalbe, show "Bluetooth, driving mode, NFC"
  case 2: driving mode available and NFC is not availalbe, show "Bluetooth, driving mode"
  case 3: driving mode not available and NFC is availalbe, show "Bluetooth, NFC"
  case 4: driving mode not available and NFC not availalbe, show "Bluetooth"
* Add test to verify the summary string is correct in each condition
* Add test to verify getAvailabilityStatus() is AVAILABLE.

Bug: 79299421
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest
Change-Id: I1048355bbd344db3ab645dd1537b4259eff57f38
Merged-In: I1048355bbd344db3ab645dd1537b4259eff57f38
2018-05-18 18:17:27 +00:00
TreeHugger Robot
d24c9e4a80 Merge "Grey the previously connected device preference" into pi-dev 2018-05-18 03:21:57 +00:00
hughchen
980b718989 Grey the previously connected device preference
* Add PreviouslyConnectedDevicePreferenceController to handle the preference should be
  enable or disable.
  Example: If there are no previously connected devices disable the preference otherwise
  enable it.
* Add PreviouslyConnectedDevicePreferenceControllerTest
  1. Verify the callback can be registered and unregistered
  2. Verify the preference is enable when there
     have more than 1 previously connected device
  3. Verify the preference is disable when there
     have no previously connected device

Bug: 78250052
Test: make -j50 RunSettingsRoboTests
Change-Id: I31b5d416aaf907c3bbf1cb61de6e7401463e3df7
Merged-In: I31b5d416aaf907c3bbf1cb61de6e7401463e3df7
2018-05-18 02:16:23 +00:00
Antony Sargent
0d9afde271 Updated delete icon
Also remove the duplicate ic_menu_delete.xml and fix up places where it
was used.

Bug: 77982107
Test: manual
Change-Id: I23ede37b7cdf9bea59b44cd0f817bf0ad0cd1d69
2018-05-17 11:55:40 -07:00
TreeHugger Robot
4050d35c9f Merge "Grey the previously connected device preference" 2018-05-17 16:30:39 +00:00
Beverly
7e99c0d595 Merge "Get rid of divider above ringtone selector" into pi-dev am: 24bbc4bfe1
am: 976c1d9dd3

Change-Id: If38b79abb72a10cc7f42c5b8e8359682c3a0dc1d
2018-05-17 07:00:36 -07:00
TreeHugger Robot
24bbc4bfe1 Merge "Get rid of divider above ringtone selector" into pi-dev 2018-05-17 13:34:34 +00:00
hughchen
fc6030983f Merge "Add Rename device on Bluetooth screen" into pi-dev am: 667cbc5846
am: 5783578aad

Change-Id: Ibc9a0adc76de9c411391d612238fa39d42d1ddc3
2018-05-17 02:17:55 -07:00
TreeHugger Robot
667cbc5846 Merge "Add “Rename device” on Bluetooth screen" into pi-dev 2018-05-17 09:08:30 +00:00
TreeHugger Robot
273faa216e Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev 2018-05-17 09:06:18 +00:00
hughchen
0404968d8b Grey the previously connected device preference
* For fix the TreeHugger error in pi-dev, cherry pick the ag/3935357 in
  master and fix TreeHugger error.
* Add PreviouslyConnectedDevicePreferenceController to handle the preference should be
  enable or disable.
  Example: If there are no previously connected devices disable the preference otherwise
  enable it.
* Add PreviouslyConnectedDevicePreferenceControllerTest
  1. Verify the callback can be registered and unregistered
  2. Verify the preference is enable when there
     have more than 1 previously connected device
  3. Verify the preference is disable when there
     have no previously connected device

Bug: 78250052
Test: make -j50 RunSettingsRoboTests
Change-Id: I31b5d416aaf907c3bbf1cb61de6e7401463e3df7
2018-05-17 16:55:31 +08:00
TreeHugger Robot
e3319d0449 Merge "Move app setting link from Entity header to pref controller" into pi-dev 2018-05-16 20:51:17 +00:00
Fan Zhang
cac18e12ac Move app setting link from Entity header to pref controller
Change-Id: I13a27486a9c9b4c4fb358715d678473e63c1b624
Merged-In: I13a27486a9c9b4c4fb358715d678473e63c1b624
Fixes: 79688822
Test: robotest
2018-05-16 19:56:33 +00:00
Fan Zhang
8e925a4282 Merge "Move app setting link from Entity header to pref controller" 2018-05-16 19:48:32 +00:00
TreeHugger Robot
77d9076158 Merge "Merge Ambient display into Lockscreen settings." 2018-05-16 19:15:40 +00:00
TreeHugger Robot
a0f9241400 Merge "Support Vibrate for calls in Settings Slices" into pi-dev 2018-05-16 18:48:14 +00:00
Beverly
3f42a23816 Get rid of divider above ringtone selector
Change-Id: I939d1ab061fb55853fbc0505b8d9025715b9df97
Fixes: 79480349
Test: manual
2018-05-16 14:28:15 -04:00
Fan Zhang
30d4d015b5 Merge Ambient display into Lockscreen settings.
And remove the entry point from security page. Now we only have 1 entry
point from Display page.

Change-Id: I06bc15a6fd8802a4918d8772af2722d5aafa332e
Fixes: 71892510
Test: robotests
2018-05-16 11:24:32 -07:00
hughchen
8f553c0459 Merge "Change string from "Add device" to "Pair new device"" into pi-dev am: 46338558e1
am: 14ce329377

Change-Id: I2e7bdff197a17b7d7f6582f99594aa916fd79181
2018-05-16 10:56:32 -07:00
Fan Zhang
e2346643c7 Move app setting link from Entity header to pref controller
Change-Id: I13a27486a9c9b4c4fb358715d678473e63c1b624
Fixes: 79688822
Test: robotest
2018-05-16 10:51:31 -07:00
Fan Zhang
7d6539d09b Merge "Support Vibrate for calls in Settings Slices" 2018-05-16 17:22:29 +00:00
hughchen
52feedf354 Bluetooth and NFC added back to Connection preferences
* Bluetooth and NFC added back to "Connection preferences"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
Merged-In: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
2018-05-16 17:03:31 +00:00
hughchen
4e0e3c83e8 Change string from "Add device" to "Pair new device"
Change string from "Add device" to "Pair new device"

Bug: 79298886
Test: Build pass
Change-Id: Iac4e251d5fab794f90e98911208f026d62b91659
2018-05-16 19:17:06 +08:00
hughchen
4bf7c3a921 Bluetooth and NFC added back to Connection preferences
* For fix the TreeHugger error in pi-dev, cherry pick the ag/4023339 in
  master and fix TreeHugger "Automatic merge failed" error.
* Bluetooth and NFC added back to "Connection preferences"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
2018-05-16 08:03:00 +00:00
joeshih
a025eb2b35 Support Vibrate for calls in Settings Slices
Use TogglePreferenceController instead of AbstractPreferenceController
for VibrateWhenRingPreferenceControllr

Bug:74915140
Test: make RunSettingsRoboTests
Change-Id: Ib06126324516826411a7d50a2bd8a790bfd477c7
Merged-In: I501a1470da7dc1ff582c2a90b5235b25036caefc
2018-05-16 11:36:45 +08:00
Fan Zhang
9648d5799e Merge "Convert Smart Storage to BasePrefController" 2018-05-16 00:21:51 +00:00
TreeHugger Robot
52e7880544 Merge "Migrate UnrestrictedDataAccess to DashboardFragment" 2018-05-15 18:18:19 +00:00
Beverly
88516c0d89 Merge "Gets rid of dividers in sound settings" into pi-dev am: e6f66a3c9a
am: e385ab21a3

Change-Id: Ic49618490e07f940b4caafa418eb160aa676ad91
2018-05-15 06:24:36 -07:00
TreeHugger Robot
e6f66a3c9a Merge "Gets rid of dividers in sound settings" into pi-dev 2018-05-15 13:16:22 +00:00
Yanting_Yang
db435e256d Migrate UnrestrictedDataAccess to DashboardFragment
- UnrestrictedDataAccessPreferenceController

Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.datausage
      make RunSettingsRoboTests -j ROBOTEST_FILTER=CodeInspectionTest
      atest UniquePreferenceTest

Change-Id: I71abd837ef51e4e9e0a2ee46791d704245c9b3ab
2018-05-14 21:18:38 -07:00