OSDN Git Service
Beverly [Fri, 18 May 2018 18:33:36 +0000 (14:33 -0400)]
Set click listeners on displayPreference
Cherry-picked from pi-dev
Test: manual (tap options multiple times with talkback on)
Test: ZenModeVisEffectsCustomPreferenceControllerTest, robotests
Change-Id: Iffa701fb486bd9eeda7d2c4c46cb30392a09a5df
Fixes:
79728671
Fan Zhang [Fri, 18 May 2018 21:39:57 +0000 (14:39 -0700)]
Fix color lint baseline. am:
76a0ef6adb
am:
11c9f97a2f
Change-Id: I541566eda1a225d096c8a1210cfff114cef08a05
Fan Zhang [Fri, 18 May 2018 21:36:21 +0000 (14:36 -0700)]
Fix color lint baseline.
am:
76a0ef6adb
Change-Id: I814c6575a157fa6c4f27cb68aa076df23f94e3be
Fan Zhang [Fri, 18 May 2018 20:27:11 +0000 (13:27 -0700)]
Fix color lint baseline.
This is broken by some automerge.
Change-Id: I520eff408ef2d071893b0ed4de3c4e58916bf9fc
Fixes:
79954469
Test: repo preupload
Ching-Sung Li [Fri, 18 May 2018 06:28:21 +0000 (14:28 +0800)]
Update color whitelist for color repohook (caused by auto-merge)
It's blocking CLs to be uploaded to git server becuase inconsistent code
by auto-merge
Test: Can build and upload CLs
Bug:
79954469
Change-Id: I8dfc2cb8d660c6ddc97b3e1c8f06db7db2e15cfb
Android Build Merger (Role) [Fri, 18 May 2018 19:35:01 +0000 (19:35 +0000)]
Merge "[automerger skipped] Merge "Add Intentfilter BasePreferenceController" into pi-dev am:
e7906cb910 am:
f7fcdbda29 -s ours"
Matthew Fritze [Fri, 18 May 2018 19:34:54 +0000 (12:34 -0700)]
[automerger skipped] Merge "Add Intentfilter BasePreferenceController" into pi-dev am:
e7906cb910
am:
f7fcdbda29 -s ours
Change-Id: Ie1456f331f0547576ca3e540733e7b0982755700
TreeHugger Robot [Fri, 18 May 2018 19:34:48 +0000 (19:34 +0000)]
Merge "Add controller to show the summary"
hughchen [Fri, 18 May 2018 19:27:08 +0000 (12:27 -0700)]
Merge "Update UI when BT device is rename" into pi-dev am:
77d218ab72
am:
3053922340
Change-Id: I86bd3be4f017f5bd80a2308a5b1e99366027a476
Matthew Fritze [Fri, 18 May 2018 18:59:11 +0000 (11:59 -0700)]
Merge "Add Intentfilter BasePreferenceController" into pi-dev
am:
e7906cb910
Change-Id: I4205a88200dcb02ba9029721618da790cb562ea0
hughchen [Fri, 18 May 2018 18:52:02 +0000 (11:52 -0700)]
Merge "Update UI when BT device is rename" into pi-dev
am:
77d218ab72
Change-Id: I00e7f52939014e6a3079f0a0743fa982fe8abd0a
TreeHugger Robot [Fri, 18 May 2018 18:41:53 +0000 (18:41 +0000)]
Merge "Add Intentfilter BasePreferenceController" into pi-dev
hughchen [Fri, 11 May 2018 12:11:56 +0000 (20:11 +0800)]
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
TreeHugger Robot [Fri, 18 May 2018 18:16:17 +0000 (18:16 +0000)]
Merge "Add Intentfilter BasePreferenceController"
TreeHugger Robot [Fri, 18 May 2018 18:06:17 +0000 (18:06 +0000)]
Merge "Update UI when BT device is rename" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 17:47:53 +0000 (17:47 +0000)]
Merge "Micro-cleanup in password settings"
Lei Yu [Fri, 18 May 2018 17:46:18 +0000 (10:46 -0700)]
Merge "Don't drop log about excessive O anomaly." into pi-dev am:
a866d6bd56
am:
7ca87fe51b
Change-Id: I1aeebb2b1c8a162390adc3667d850077eed3cc56
Lei Yu [Fri, 18 May 2018 17:31:44 +0000 (10:31 -0700)]
Merge "Don't drop log about excessive O anomaly." into pi-dev
am:
a866d6bd56
Change-Id: Ic35a5326c2a9be3024ad246a793e05221b2d7aca
TreeHugger Robot [Fri, 18 May 2018 17:29:58 +0000 (17:29 +0000)]
Merge "Rename the Utils class in settingslib.bluetooth"
Lei Yu [Fri, 18 May 2018 17:09:44 +0000 (17:09 +0000)]
Merge "Don't drop log about excessive O anomaly." into pi-dev
Pavel Grafov [Fri, 18 May 2018 16:03:20 +0000 (17:03 +0100)]
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
Matthew Fritze [Fri, 11 May 2018 15:35:42 +0000 (08:35 -0700)]
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
Matthew Fritze [Fri, 11 May 2018 15:35:42 +0000 (08:35 -0700)]
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
Matthew Fritze [Fri, 18 May 2018 15:00:45 +0000 (08:00 -0700)]
[automerger skipped] Merge "Add DnD as a special case Slice" into pi-dev am:
6dc6462a54
am:
6393e4bcfe -s ours
Change-Id: I0181444b0286def4faf8dc33454da542c7cc026d
Matthew Fritze [Fri, 18 May 2018 14:46:41 +0000 (07:46 -0700)]
Merge "Add DnD as a special case Slice" into pi-dev
am:
6dc6462a54
Change-Id: I8f6260380bb7241ebce956ff2772f7e6ee0218b6
TreeHugger Robot [Fri, 18 May 2018 14:41:45 +0000 (14:41 +0000)]
Merge "Add DnD as a special case Slice" into pi-dev
hughchen [Fri, 18 May 2018 04:20:22 +0000 (21:20 -0700)]
[automerger skipped] Merge "Grey the previously connected device preference" into pi-dev am:
d24c9e4a80
am:
25ed11a1a7 -s ours
Change-Id: Ibb585afdcbd1e036b59219987c3e135675205387
nharold [Fri, 18 May 2018 04:12:42 +0000 (21:12 -0700)]
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
Doris Ling [Fri, 18 May 2018 04:11:21 +0000 (21:11 -0700)]
Merge "Update condition title text color." into pi-dev am:
ad031a0a4d
am:
05a0d4f413
Change-Id: I99557205959a219f6d71af946d635aa50e5ee331
TreeHugger Robot [Fri, 18 May 2018 04:06:29 +0000 (04:06 +0000)]
Merge "Add DnD as a special case Slice"
hughchen [Fri, 18 May 2018 03:48:39 +0000 (20:48 -0700)]
Merge "Grey the previously connected device preference" into pi-dev
am:
d24c9e4a80
Change-Id: Ib21ad60483a97563c075f12d49b0179db44e661b
Android Build Merger (Role) [Fri, 18 May 2018 03:41:13 +0000 (03:41 +0000)]
Merge "[automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks" am:
5ff91e4fbe am:
768e0a2f37 -s ours" into pi-dev-plus-aosp
Doris Ling [Fri, 18 May 2018 03:40:58 +0000 (20:40 -0700)]
Merge "Update condition title text color." into pi-dev
am:
ad031a0a4d
Change-Id: Ibb33ebb3327ed60768399ba5ad3aa18d05ba7846
nharold [Fri, 18 May 2018 03:40:32 +0000 (20:40 -0700)]
[automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks" am:
5ff91e4fbe
am:
768e0a2f37 -s ours
Change-Id: I79f4451f4e534fdaaa7e18c28221c6fc35cdba11
TreeHugger Robot [Fri, 18 May 2018 03:21:57 +0000 (03:21 +0000)]
Merge "Grey the previously connected device preference" into pi-dev
nharold [Fri, 18 May 2018 02:29:13 +0000 (19:29 -0700)]
Merge changes from topic "telephony-debug-pi-tweaks"
am:
5ff91e4fbe
Change-Id: Ia2798429d3be242a56d8ac541668ada90ea499d7
Doris Ling [Fri, 18 May 2018 02:27:38 +0000 (19:27 -0700)]
Merge "Adjust Lock screen message for better accessibility." into pi-dev am:
1b242d24ca
am:
687b7aecec
Change-Id: Ic8afe6017cb049813070e8b271d624795920201c
Lei Yu [Fri, 18 May 2018 02:21:49 +0000 (19:21 -0700)]
Merge "Fix tethering summary when airplane mode is off" into pi-dev am:
a07b1f83a8
am:
8ed6b5dabf
Change-Id: I27bd8d85f0c22207336f8bf632280a5bfd243658
hughchen [Mon, 23 Apr 2018 07:55:51 +0000 (15:55 +0800)]
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
Lei Yu [Fri, 18 May 2018 02:14:53 +0000 (19:14 -0700)]
Merge "Adjust wifi dialog for better accessibility" into pi-dev am:
e2d14d409e
am:
9959944faf
Change-Id: I9da6925b538c8ff527a3501df16471d5462a8eec
TreeHugger Robot [Fri, 18 May 2018 01:59:24 +0000 (01:59 +0000)]
Merge "Update condition title text color." into pi-dev
Doris Ling [Fri, 18 May 2018 01:48:08 +0000 (18:48 -0700)]
Merge "Adjust Lock screen message for better accessibility." into pi-dev
am:
1b242d24ca
Change-Id: Ie36b95d76d53076c4d35a5973c260dd98c5e0693
Fan Zhang [Fri, 18 May 2018 01:41:39 +0000 (18:41 -0700)]
Merge "Misc style updates to fix some GAR issues" into pi-dev am:
2200308554
am:
7a6a3b28a9
Change-Id: Ia249bbcced52acb9b0316f218472f53ef3868993
Lei Yu [Fri, 18 May 2018 01:30:48 +0000 (18:30 -0700)]
Merge "Fix tethering summary when airplane mode is off" into pi-dev
am:
a07b1f83a8
Change-Id: I2f200d8f70e4f84906d0db4b9a3dd831d3278bfc
Doris Ling [Fri, 18 May 2018 01:23:00 +0000 (01:23 +0000)]
Merge "Adjust Lock screen message for better accessibility." into pi-dev
Matthew Fritze [Mon, 30 Apr 2018 19:48:44 +0000 (12:48 -0700)]
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
Matthew Fritze [Mon, 30 Apr 2018 19:48:44 +0000 (12:48 -0700)]
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
Lei Yu [Fri, 18 May 2018 01:19:25 +0000 (18:19 -0700)]
Merge "Adjust wifi dialog for better accessibility" into pi-dev
am:
e2d14d409e
Change-Id: I5dc74f51fdbcd00d0dd71d632313c60f200a639d
nharold [Fri, 18 May 2018 01:15:48 +0000 (01:15 +0000)]
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
Fan Zhang [Fri, 18 May 2018 01:13:41 +0000 (18:13 -0700)]
Merge "Misc style updates to fix some GAR issues" into pi-dev
am:
2200308554
Change-Id: Ia3ed8b5a46ec3be2a718af8e31a0ef6af64ab541
TreeHugger Robot [Fri, 18 May 2018 00:49:50 +0000 (00:49 +0000)]
Merge "Fix tethering summary when airplane mode is off" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 00:12:44 +0000 (00:12 +0000)]
Merge "Adjust wifi dialog for better accessibility" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 00:09:44 +0000 (00:09 +0000)]
Merge "Misc style updates to fix some GAR issues" into pi-dev
Lei Yu [Thu, 17 May 2018 23:42:50 +0000 (16:42 -0700)]
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
Doris Ling [Thu, 17 May 2018 23:34:37 +0000 (16:34 -0700)]
Update condition title text color.
- change from color accent to text color primary.
Change-Id: I9aae199a1d98772125526468aa80f9f423b106c0
Fixes:
79700374
Test: visual
Lei Yu [Thu, 17 May 2018 21:32:59 +0000 (14:32 -0700)]
Adjust wifi dialog for better accessibility
For some items, change the minHeight to 48dp. Also update text size
a little bit to fit the new height.
Change-Id: I87d3067c29d0d87eff6eadc4332984171e9fe4b6
Fixes:
79722015
Test: Build
Fan Zhang [Thu, 17 May 2018 21:05:53 +0000 (14:05 -0700)]
Misc style updates to fix some GAR issues
- Increase tap target height for add wifi dialog entries.
- Increase tap height for vpn editor fields
- Tap target area for switchbar toggle
Change-Id: I0d0e350dd4236cd4fe73fa190fb79ca50de2da60
Fixes:
79871635
Fixes:
79887410
Test: visual
Doris Ling [Thu, 17 May 2018 18:26:21 +0000 (11:26 -0700)]
Adjust Lock screen message for better accessibility.
- increase text height to 48dp
Change-Id: Ie3ab56eeed453bb7b131458a3966534a0bf68871
Fixes:
79711251
Test: visual
Lei Yu [Thu, 17 May 2018 19:32:02 +0000 (12:32 -0700)]
Fix tethering summary when airplane mode is off
When airplane mode is off, fall back to default summary
(tether off summary). It should be fine because once tether
state get updated again, it will go through original listener
to update the summary.
Change-Id: Iba9b56f452e72365ea964d841ee156a2625c0ae1
Fixes:
79721162
Test: RunSettingsRoboTests
Andrew Sapperstein [Thu, 17 May 2018 20:59:26 +0000 (13:59 -0700)]
Merge "Make the night display suggestion depend on a flag." into pi-dev am:
96294df2f0
am:
95e789dc58
Change-Id: I732a4d92f23354db44ce294096ad1e38ae0f198b
Jason Monk [Thu, 17 May 2018 20:56:03 +0000 (13:56 -0700)]
Merge "Hook up slice deep links" into pi-dev am:
7e6d495cec
am:
9f6028edde
Change-Id: Ie8ccce9eb7e880c8764a2ce3cb6d1151770c9393
Andrew Sapperstein [Thu, 17 May 2018 20:42:38 +0000 (13:42 -0700)]
Merge "Make the night display suggestion depend on a flag." into pi-dev
am:
96294df2f0
Change-Id: I1463f360f286e7770d0e7ecd5e7d3ab69ecff837
Jason Monk [Thu, 17 May 2018 20:41:27 +0000 (13:41 -0700)]
Merge "Hook up slice deep links" into pi-dev
am:
7e6d495cec
Change-Id: I0a0bd515a5b43828092ca4ec50ef9d20c660a4da
Andrew Sapperstein [Thu, 17 May 2018 20:40:21 +0000 (20:40 +0000)]
Merge "Make the night display suggestion depend on a flag." into pi-dev
TreeHugger Robot [Thu, 17 May 2018 20:15:39 +0000 (20:15 +0000)]
Merge "Hook up slice deep links" into pi-dev
Fan Zhang [Thu, 17 May 2018 19:56:44 +0000 (12:56 -0700)]
Merge "Do not perform device index before device provision." into pi-dev am:
1fe4512596
am:
8a8b58d381
Change-Id: Ie111e38c79735090a0cedae253d97d638f974209
Fan Zhang [Thu, 17 May 2018 19:50:17 +0000 (12:50 -0700)]
Merge "Do not perform device index before device provision." into pi-dev
am:
1fe4512596
Change-Id: I2cc6689cd6c80df36c4565fc48b396abb4b16288
TreeHugger Robot [Thu, 17 May 2018 19:41:43 +0000 (19:41 +0000)]
Merge "Do not perform device index before device provision." into pi-dev
Rubin Xu [Thu, 17 May 2018 19:25:28 +0000 (12:25 -0700)]
Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev am:
ef088843ae
am:
7ff1a26d03
Change-Id: I19586d174fe2b6b2eac8f68525a81e7cb6039fc0
Rubin Xu [Thu, 17 May 2018 19:14:17 +0000 (12:14 -0700)]
Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev
am:
ef088843ae
Change-Id: I0b0e7912fcbdcb819a6b7f2e50f91eef18b8092a
Rubin Xu [Thu, 17 May 2018 18:57:46 +0000 (18:57 +0000)]
Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev
Nathan Harold [Tue, 24 Apr 2018 20:21:19 +0000 (13:21 -0700)]
[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
Nathan Harold [Wed, 18 Apr 2018 00:13:30 +0000 (17:13 -0700)]
[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
Nathan Harold [Wed, 18 Apr 2018 00:09:42 +0000 (17:09 -0700)]
[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
Nathan Harold [Tue, 24 Apr 2018 20:31:07 +0000 (13:31 -0700)]
[Telephony Debug Menu] Add Link Capacity Estimate
Register for the Link capacity estimate for the
cellular default data connection and report it
in the debug menu.
Bug:
78791811
Test: manual
Merged-In: I73d945dfa192873936107902e0de6d58fc69059b
Change-Id: I73d945dfa192873936107902e0de6d58fc69059b
(cherry picked from commit
f10ea32d5572e3e65057532ddb1b3687f5a9f77e)
Nathan Harold [Tue, 24 Apr 2018 01:20:43 +0000 (18:20 -0700)]
[Telephony Debug Menu] Add Physical Channel Config
Add a field to display the PhyChanConfig and register
for this event as part of the PhoneStateListener.
Bug:
78791811
Test: manual
Merged-In: Ic038aa65655f8efa98bf1d6388e7c61761d2eb4a
Change-Id: Ic038aa65655f8efa98bf1d6388e7c61761d2eb4a
(cherry picked from commit
433ca4427ca8d3b349b9997f3dca03f96c5739cf)
Nathan Harold [Wed, 18 Apr 2018 00:01:32 +0000 (17:01 -0700)]
[Telephony Debug Menu] LTE BW and Serving CellInfo
Add debug menu support for the serving cell status
indication and the LTE bandwidth in the CellInfo
display.
Bug:
78791811
Test: manual
Merged-In: Ic51858131af671317431e0970bdcaeebcb460931
Change-Id: Ic51858131af671317431e0970bdcaeebcb460931
(cherry picked from commit
6e16fdf39907f6edaeb9fb431ed1cf20a8091b05)
Matthew Fritze [Thu, 17 May 2018 18:44:59 +0000 (11:44 -0700)]
[automerger skipped] Add Wifi Slice am:
46aa586610
am:
b877c174a6 -s ours
Change-Id: I409a86b3ed0f76e5df9f5d9734a1f8fc286fe710
Matthew Fritze [Thu, 17 May 2018 18:35:43 +0000 (11:35 -0700)]
Add Wifi Slice
am:
46aa586610
Change-Id: If12651655b7b360ee3ed886a111f35e614a2c818
TreeHugger Robot [Thu, 17 May 2018 18:21:16 +0000 (18:21 +0000)]
Merge "Add Wifi Slice"
TreeHugger Robot [Thu, 17 May 2018 18:18:29 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE"
Daniel Nishi [Thu, 3 May 2018 02:29:16 +0000 (19:29 -0700)]
Make the night display suggestion depend on a flag.
This allows it to be enabled/disabled on certain devices.
Change-Id: I7b73bb866b05b92588e15ef7ffc2834cdde041ce
Fixes:
78601616
Test: Settings robotest
Doris Ling [Thu, 17 May 2018 17:27:46 +0000 (17:27 +0000)]
Merge "Add resource for Backup summary."
Matthew Fritze [Tue, 1 May 2018 23:52:46 +0000 (16:52 -0700)]
Add Wifi Slice
Add a custom Wifi Slice to the Settings Slice Provider.
It needs a custom Slice because of the complicated listener logic
in the MasterSwitchPreferenceController, which makes it hard to
work-in synchronous set/get logic.
The one-off Slice requires extra changes, including:
- Including it in getDescendants
- Handling changes to wifi by the framework
This is the first change that uses SettingsLib's broadcast relay,
which allows settings to (un)register IntentFilters to a Uri,
allowing Settings Slices affected by the framework (quicksettings,
connectivity related, volume, etc) to be updated without action
on the Slice.
Bug:
70622039
Bug:
67997332
Test: robotests
Change-Id: Ibfe4736beecb833e3f6bb871b2eb5228a5fd3a34
Matthew Fritze [Tue, 1 May 2018 23:52:46 +0000 (16:52 -0700)]
Add Wifi Slice
Add a custom Wifi Slice to the Settings Slice Provider.
It needs a custom Slice because of the complicated listener logic
in the MasterSwitchPreferenceController, which makes it hard to
work-in synchronous set/get logic.
The one-off Slice requires extra changes, including:
- Including it in getDescendants
- Handling changes to wifi by the framework
This is the first change that uses SettingsLib's broadcast relay,
which allows settings to (un)register IntentFilters to a Uri,
allowing Settings Slices affected by the framework (quicksettings,
connectivity related, volume, etc) to be updated without action
on the Slice.
Fixes:
70622039
Fixes:
67997332
Test: robotests
Change-Id: Ia76738dd6baacd5522d52df2c61ebad86a600282
Merged-In: Ibfe4736beecb833e3f6bb871b2eb5228a5fd3a34
TreeHugger Robot [Thu, 17 May 2018 16:30:39 +0000 (16:30 +0000)]
Merge "Grey the previously connected device preference"
TreeHugger Robot [Thu, 17 May 2018 15:52:57 +0000 (15:52 +0000)]
Merge "Fuelgauge update comment for StatsManager API"
Beverly [Thu, 17 May 2018 14:00:36 +0000 (07:00 -0700)]
Merge "Get rid of divider above ringtone selector" into pi-dev am:
24bbc4bfe1
am:
976c1d9dd3
Change-Id: If38b79abb72a10cc7f42c5b8e8359682c3a0dc1d
Rubin Xu [Thu, 17 May 2018 13:48:49 +0000 (14:48 +0100)]
Setting should handle android.settings.SYNC_SETTINGS from managed profile
When android.settings.SYNC_SETTINGS is fired from a managed profile, Settings
should handle it properly and displays the UI to manage accounts in the profile.
Since Settings uses a unified page to display both personal and work accounts,
it should redirect the intent to the UserAndAccountDashboardActivity in user 0
Bug:
79561138
Test: adb shell am start -a android.settings.SYNC_SETTINGS --user 10
verifies the UI is showing work accounts
Change-Id: Ib82a04ad0ec72d58d60569e38538c5dbd6181bf0
Beverly [Thu, 17 May 2018 13:51:31 +0000 (06:51 -0700)]
Merge "Get rid of divider above ringtone selector" into pi-dev
am:
24bbc4bfe1
Change-Id: I3d94d0cc0f7c6ea6c38f4dffed92af9f73d9ebc1
TreeHugger Robot [Thu, 17 May 2018 13:34:34 +0000 (13:34 +0000)]
Merge "Get rid of divider above ringtone selector" into pi-dev
hughchen [Thu, 17 May 2018 09:17:55 +0000 (02:17 -0700)]
Merge "Add Rename device on Bluetooth screen" into pi-dev am:
667cbc5846
am:
5783578aad
Change-Id: Ibc9a0adc76de9c411391d612238fa39d42d1ddc3
hughchen [Thu, 17 May 2018 09:17:20 +0000 (02:17 -0700)]
[automerger skipped] Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev am:
273faa216e
am:
32b1a4129e -s ours
Change-Id: If29cfc933d69a6db92ab7317323ff338bb0366ec
hughchen [Thu, 17 May 2018 09:13:56 +0000 (02:13 -0700)]
Merge "Add Rename device on Bluetooth screen" into pi-dev
am:
667cbc5846
Change-Id: Ib44bc3f768769dc9089a33543912faf871fafab5
hughchen [Thu, 17 May 2018 09:13:22 +0000 (02:13 -0700)]
Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev
am:
273faa216e
Change-Id: I01c054196b04b66677708711be0d298ef2c24041
TreeHugger Robot [Thu, 17 May 2018 09:08:30 +0000 (09:08 +0000)]
Merge "Add “Rename device” on Bluetooth screen" into pi-dev
TreeHugger Robot [Thu, 17 May 2018 09:06:18 +0000 (09:06 +0000)]
Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev
hughchen [Mon, 23 Apr 2018 07:55:51 +0000 (15:55 +0800)]
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
hughchen [Thu, 17 May 2018 08:45:08 +0000 (01:45 -0700)]
[automerger skipped] Update DialogFragment UI when BT device is add/remove/rename am:
b6ac12eed4
am:
1e1b265e9c -s ours
Change-Id: I65ec6ba68390c05dc75d50cf5b3ee2eaa156f281
hughchen [Thu, 17 May 2018 08:41:01 +0000 (01:41 -0700)]
Update DialogFragment UI when BT device is add/remove/rename
am:
b6ac12eed4
Change-Id: I788ef736d4d44d7224add9e2cfbd4a3fa9febc73