Commit Graph

46722 Commits

Author SHA1 Message Date
Matthew Fritze
f7fcdbda29 Merge "Add Intentfilter BasePreferenceController" into pi-dev
am: e7906cb910

Change-Id: I4205a88200dcb02ba9029721618da790cb562ea0
2018-05-18 11:59:11 -07:00
hughchen
3053922340 Merge "Update UI when BT device is rename" into pi-dev
am: 77d218ab72

Change-Id: I00e7f52939014e6a3079f0a0743fa982fe8abd0a
2018-05-18 11:52:02 -07:00
TreeHugger Robot
e7906cb910 Merge "Add Intentfilter BasePreferenceController" into pi-dev 2018-05-18 18:41:53 +00: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
cf0e76b4cf Merge "Add Intentfilter BasePreferenceController" 2018-05-18 18:16:17 +00:00
TreeHugger Robot
77d218ab72 Merge "Update UI when BT device is rename" into pi-dev 2018-05-18 18:06:17 +00:00
TreeHugger Robot
1acaac079c Merge "Micro-cleanup in password settings" 2018-05-18 17:47:53 +00:00
Lei Yu
f94e2cca07 Merge "Don't drop log about excessive O anomaly." into pi-dev am: a866d6bd56
am: 7ca87fe51b

Change-Id: I1aeebb2b1c8a162390adc3667d850077eed3cc56
2018-05-18 10:46:18 -07:00
Lei Yu
7ca87fe51b Merge "Don't drop log about excessive O anomaly." into pi-dev
am: a866d6bd56

Change-Id: Ic35a5326c2a9be3024ad246a793e05221b2d7aca
2018-05-18 10:31:44 -07:00
TreeHugger Robot
09b8210d3f Merge "Rename the Utils class in settingslib.bluetooth" 2018-05-18 17:29:58 +00:00
Lei Yu
a866d6bd56 Merge "Don't drop log about excessive O anomaly." into pi-dev 2018-05-18 17:09:44 +00:00
Pavel Grafov
5c9bbc1777 Micro-cleanup in password settings
Removed unused constant and member that was set and retained across instances
but never actually used.

Test: manual, set password
Bug: 30558331
Change-Id: I575bf1f0508b9441b220641715e9ca7372d9b32c
2018-05-18 17:03:20 +01:00
Matthew Fritze
4a6f058552 Add Intentfilter BasePreferenceController
For settings which can change in the framework, outside of
the settings app and a slice, a Slice needs to be able to
register a listener for these changes.

Adding a getter for an IntentFilter in BasePreferenceControllers
allows us to use the SliceBroadcastRelay in SysUi to listen for
these changes.

Test: robotests
Fixes: 78138654

Change-Id: I579375069ca98fd21b60cd3a69c1a122cabf96e2
Merged-In: Ifa05b651aaa3458c54866f71469964b1a070e458
2018-05-18 08:06:08 -07:00
Matthew Fritze
097dc80fc1 Add Intentfilter BasePreferenceController
For settings which can change in the framework, outside of
the settings app and a slice, a Slice needs to be able to
register a listener for these changes.

Adding a getter for an IntentFilter in BasePreferenceControllers
allows us to use the SliceBroadcastRelay in SysUi to listen for
these changes.

Test: robotests
Bug: 78138654
Change-Id: Ifa05b651aaa3458c54866f71469964b1a070e458
2018-05-18 08:04:18 -07:00
Matthew Fritze
00c74a9d9c [automerger skipped] Merge "Add DnD as a special case Slice" into pi-dev am: 6dc6462a54
am: 6393e4bcfe  -s ours

Change-Id: I0181444b0286def4faf8dc33454da542c7cc026d
2018-05-18 08:00:45 -07:00
Matthew Fritze
6393e4bcfe Merge "Add DnD as a special case Slice" into pi-dev
am: 6dc6462a54

Change-Id: I8f6260380bb7241ebce956ff2772f7e6ee0218b6
2018-05-18 07:46:41 -07:00
TreeHugger Robot
6dc6462a54 Merge "Add DnD as a special case Slice" into pi-dev 2018-05-18 14:41:45 +00:00
hughchen
9dd27e3125 [automerger skipped] Merge "Grey the previously connected device preference" into pi-dev am: d24c9e4a80
am: 25ed11a1a7  -s ours

Change-Id: Ibb585afdcbd1e036b59219987c3e135675205387
2018-05-17 21:20:22 -07:00
nharold
4b04bb768e Merge "[automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks" am: 5ff91e4fbe am: 768e0a2f37 -s ours" into pi-dev-plus-aosp
am: 187e0a117c

Change-Id: Ia1300269e3f8b06826d119934c2b80349aed3f39
2018-05-17 21:12:42 -07:00
Doris Ling
932a63e380 Merge "Update condition title text color." into pi-dev am: ad031a0a4d
am: 05a0d4f413

Change-Id: I99557205959a219f6d71af946d635aa50e5ee331
2018-05-17 21:11:21 -07:00
TreeHugger Robot
45c29f15b9 Merge "Add DnD as a special case Slice" 2018-05-18 04:06:29 +00:00
hughchen
25ed11a1a7 Merge "Grey the previously connected device preference" into pi-dev
am: d24c9e4a80

Change-Id: Ib21ad60483a97563c075f12d49b0179db44e661b
2018-05-17 20:48:39 -07:00
Android Build Merger (Role)
187e0a117c Merge "[automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks" am: 5ff91e4fbe am: 768e0a2f37 -s ours" into pi-dev-plus-aosp 2018-05-18 03:41:13 +00:00
Doris Ling
05a0d4f413 Merge "Update condition title text color." into pi-dev
am: ad031a0a4d

Change-Id: Ibb33ebb3327ed60768399ba5ad3aa18d05ba7846
2018-05-17 20:40:58 -07:00
nharold
f9220d768d [automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks" am: 5ff91e4fbe
am: 768e0a2f37  -s ours

Change-Id: I79f4451f4e534fdaaa7e18c28221c6fc35cdba11
2018-05-17 20:40:32 -07:00
Nathan Harold
40ece56d99 [Telephony Debug Menu] Redo Layout
Changes to the layout to better group
related fields, add more definite
boundaries, fix some alignment issues,
and put more-often-used fields closer
to the top.

Bug: 78791811
Test: manual
Change-Id: I492abe16a25d1880e4385a78247925805fe5b590
2018-05-17 20:40:23 -07:00
Nathan Harold
3d41affd2c [Telephony Debug Menu] Remove DcRtInfo
Remove the obsolete and unsupported DcRtInfo
field from the Debug menu. Since it doesn't
do anything and hasn't for a few releases,
we should make space for things that are
supported and minimize clutter.

Bug: 78791811
Test: manual
Change-Id: Id4cc808bf5c7671408cd5297965d93140aeefe97
2018-05-17 20:40:23 -07:00
Nathan Harold
4219d80224 [Telephony Debug Menu] Remove NeighboringCellInfo
This CL removes the long-obsolete NeighboringCellInfo.
From a debug perspective, this info is a subset of the
other info already present, so it just adds clutter
without adding any value.

Bug: 78791811
Test: manual
Change-Id: Iaf275f81e276f63bdd9651ac60a5485bf5bdf160
2018-05-17 20:40:23 -07:00
TreeHugger Robot
d24c9e4a80 Merge "Grey the previously connected device preference" into pi-dev 2018-05-18 03:21:57 +00:00
nharold
768e0a2f37 Merge changes from topic "telephony-debug-pi-tweaks"
am: 5ff91e4fbe

Change-Id: Ia2798429d3be242a56d8ac541668ada90ea499d7
2018-05-17 19:29:13 -07:00
Doris Ling
f3eb177322 Merge "Adjust Lock screen message for better accessibility." into pi-dev am: 1b242d24ca
am: 687b7aecec

Change-Id: Ic8afe6017cb049813070e8b271d624795920201c
2018-05-17 19:27:38 -07:00
Lei Yu
c81da687a0 Merge "Fix tethering summary when airplane mode is off" into pi-dev am: a07b1f83a8
am: 8ed6b5dabf

Change-Id: I27bd8d85f0c22207336f8bf632280a5bfd243658
2018-05-17 19:21:49 -07: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
Lei Yu
8f6eef907e Merge "Adjust wifi dialog for better accessibility" into pi-dev am: e2d14d409e
am: 9959944faf

Change-Id: I9da6925b538c8ff527a3501df16471d5462a8eec
2018-05-17 19:14:53 -07:00
TreeHugger Robot
ad031a0a4d Merge "Update condition title text color." into pi-dev 2018-05-18 01:59:24 +00:00
Doris Ling
687b7aecec Merge "Adjust Lock screen message for better accessibility." into pi-dev
am: 1b242d24ca

Change-Id: Ie36b95d76d53076c4d35a5973c260dd98c5e0693
2018-05-17 18:48:08 -07:00
Fan Zhang
7f683e8252 Merge "Misc style updates to fix some GAR issues" into pi-dev am: 2200308554
am: 7a6a3b28a9

Change-Id: Ia249bbcced52acb9b0316f218472f53ef3868993
2018-05-17 18:41:39 -07:00
Lei Yu
8ed6b5dabf Merge "Fix tethering summary when airplane mode is off" into pi-dev
am: a07b1f83a8

Change-Id: I2f200d8f70e4f84906d0db4b9a3dd831d3278bfc
2018-05-17 18:30:48 -07:00
Doris Ling
1b242d24ca Merge "Adjust Lock screen message for better accessibility." into pi-dev 2018-05-18 01:23:00 +00:00
Matthew Fritze
e8b62714af Add DnD as a special case Slice
Add DND Slice as a special case, since there is an existing
inheritance structures in the zen mode preference controllers which
would be too risky to change at this point in the release.

Change-Id: If4b7013be35c89695786af2dbbea2edcf7a189f3
Merged-In: Ice608b9a7bd6f38b73e581eb3723f0a2fae96f2b
Test: make RunSettingsRoboTests
Fixes: 67997377
2018-05-17 18:20:36 -07:00
Matthew Fritze
4710917aa4 Add DnD as a special case Slice
Add DND Slice as a special case, since there is an existing
inheritance structures in the zen mode preference controllers which
would be too risky to change at this point in the release.

Test: make RunSettingsRoboTests
Bug: 67997377
Change-Id: Ice608b9a7bd6f38b73e581eb3723f0a2fae96f2b
2018-05-17 18:20:07 -07:00
Lei Yu
9959944faf Merge "Adjust wifi dialog for better accessibility" into pi-dev
am: e2d14d409e

Change-Id: I5dc74f51fdbcd00d0dd71d632313c60f200a639d
2018-05-17 18:19:25 -07:00
nharold
5ff91e4fbe Merge changes from topic "telephony-debug-pi-tweaks"
* changes:
  [Telephony Debug Menu] Redo Layout
  [Telephony Debug Menu] Remove DcRtInfo
  [Telephony Debug Menu] Remove NeighboringCellInfo
  [Telephony Debug Menu] Add Link Capacity Estimate
  [Telephony Debug Menu] Add Physical Channel Config
  [Telephony Debug Menu] LTE BW and Serving CellInfo
2018-05-18 01:15:48 +00:00
Fan Zhang
7a6a3b28a9 Merge "Misc style updates to fix some GAR issues" into pi-dev
am: 2200308554

Change-Id: Ia3ed8b5a46ec3be2a718af8e31a0ef6af64ab541
2018-05-17 18:13:41 -07:00
TreeHugger Robot
a07b1f83a8 Merge "Fix tethering summary when airplane mode is off" into pi-dev 2018-05-18 00:49:50 +00:00
TreeHugger Robot
e2d14d409e Merge "Adjust wifi dialog for better accessibility" into pi-dev 2018-05-18 00:12:44 +00:00
TreeHugger Robot
2200308554 Merge "Misc style updates to fix some GAR issues" into pi-dev 2018-05-18 00:09:44 +00:00
Lei Yu
1439c6179a Don't drop log about excessive O anomaly.
Before this CL, we will drop log for excessive bg anomaly that
target O or higher. This CL doesn't drop it however merge it to
ACTION_ANOMALY_IGNORED

Bug: 79944380
Test: RunSettingsRoboTests
Change-Id: I46d0bdb1191d8843ba373e59afb1b0ba16057661
2018-05-17 16:49:11 -07:00
Doris Ling
3d5556c6f8 Update condition title text color.
- change from color accent to text color primary.

Change-Id: I9aae199a1d98772125526468aa80f9f423b106c0
Fixes: 79700374
Test: visual
2018-05-17 16:34:37 -07:00