OSDN Git Service
Amin Shaikh [Mon, 8 Apr 2019 19:39:07 +0000 (15:39 -0400)]
Show Styles & Wallpaper in Settings
Show "Styles & Wallpaper" in Settings based on whether the ThemePicker
component is availalable. Also update dashboard summary for display.
Bug:
129874298
Test: m RunSettingsRoboTests
Change-Id: Id7e0bb9cbc689bb9e637919a10a7d1006397afab
TreeHugger Robot [Tue, 9 Apr 2019 08:30:33 +0000 (08:30 +0000)]
Merge "Should not decode Wi-Fi QR code after onPause" into qt-dev
Clown SHEN [Tue, 9 Apr 2019 06:45:49 +0000 (06:45 +0000)]
Merge "Redraw WiFi detail page's header icon" into qt-dev
TreeHugger Robot [Tue, 9 Apr 2019 05:33:21 +0000 (05:33 +0000)]
Merge changes from topic "role-replace" into qt-dev
* changes:
Remove old default apps code and use roles instead.
Move default payment app to special app access.
Arc Wang [Mon, 8 Apr 2019 11:22:44 +0000 (19:22 +0800)]
Should not decode Wi-Fi QR code after onPause
Bug:
130141694
Test: manual
atest WifiDppQrCodeScannerFragmentTest
Change-Id: I412fb7c06220c23bddc7b3c448fcc72a00bdecc3
Hai Zhang [Sat, 6 Apr 2019 07:45:42 +0000 (15:45 +0800)]
Remove old default apps code and use roles instead.
Default apps are moved into PermissionController.
Bug:
124452117
Bug:
124457823
Test: presubmit & manual
Change-Id: I5f68e5b77cd6163d093590185314270706d75391
Hai Zhang [Sat, 6 Apr 2019 08:21:32 +0000 (16:21 +0800)]
Move default payment app to special app access.
Bug:
124452117
Bug:
124522992
Test: build
Change-Id: I58e7127920d939dc3635bcc2e608cee6baa21998
TreeHugger Robot [Tue, 9 Apr 2019 05:24:21 +0000 (05:24 +0000)]
Merge "Add null check in UserPreference" into qt-dev
TreeHugger Robot [Tue, 9 Apr 2019 04:18:09 +0000 (04:18 +0000)]
Merge "Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator" into qt-dev
Arc Wang [Wed, 3 Apr 2019 10:45:22 +0000 (18:45 +0800)]
Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator
When scanned a no password ZXing QR code, add both open network &
enhanced open network to configured Wi-Fi network list because this kind
of QR code may refer to a open network or an enhanced open network.
Bug:
124131581
Test: manual
Change-Id: Id9f85ef8dcdf72347be8106938437aecd0eed9f5
clownshen [Tue, 2 Apr 2019 11:28:56 +0000 (19:28 +0800)]
Redraw WiFi detail page's header icon
Tint 87% dark in day mode and 100% white for night mode
Bug:
129413562
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: manual test
Change-Id: Ia31231ca7871ac4efcea5e1232690ff4374df5b3
(cherry picked from commit
86f65ef488a5648399c1eb29d8e631c952d5dbf1)
Arc Wang [Tue, 9 Apr 2019 01:39:35 +0000 (01:39 +0000)]
Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev
Cn Chen [Tue, 9 Apr 2019 01:27:01 +0000 (01:27 +0000)]
Merge "Fix fingerprint screens from "Anything else" screen not applying Stencil theme" into qt-dev
TreeHugger Robot [Mon, 8 Apr 2019 23:37:53 +0000 (23:37 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Xiangyu/Malcolm Chen [Mon, 8 Apr 2019 21:38:25 +0000 (21:38 +0000)]
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev
Lei Yu [Mon, 8 Apr 2019 21:28:09 +0000 (21:28 +0000)]
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." into qt-dev
Bill Yi [Mon, 8 Apr 2019 20:57:43 +0000 (13:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If0ee949c0948860c8a6834fc3b63fa0d9175cfb0
Fan Zhang [Mon, 8 Apr 2019 20:55:58 +0000 (13:55 -0700)]
Add null check in UserPreference
The comparator can get null objects according to bug report.
Fixes:
130144755
Test: manual
Change-Id: Ic8a332d390f411d2eb69c944fb7fd166d9961535
TreeHugger Robot [Mon, 8 Apr 2019 20:00:29 +0000 (20:00 +0000)]
Merge "Delete carrier entry from mobile network details page." into qt-dev
Malcolm Chen [Fri, 5 Apr 2019 05:24:25 +0000 (22:24 -0700)]
Revert switchBar if enable / disable subscription fails.
Bug:
123321718
Test: build manual test
Change-Id: Ia7e8c762d91f81b67e0d0b11d36dfa78ec1e2d18
Sumit Deshmukh [Thu, 28 Mar 2019 09:01:45 +0000 (14:31 +0530)]
Settings: [BT] Wrong Pairing Popup is shown on new pairing request.
Usecase:
1. Start advertising from DUT (using BLE Smartertooth app).
2. Scan and connect from central device.
3. Now initiate bond from central and accept pairing request.
(Consent Pairing Dialog will be shown on DUT)
4. Notification will be received for PASSKEY CONFIRMATION Dialog.
Do not open notification and let it timeout.
5. Repeat steps 2 and 3. At step 3, Passkey Confirmation pairing
dialog is show instead of Consent pairing dialog.
Issue:
Wrong Pairing Popup is shown. Passkey Confirmation pairing
dialog is show instead of Consent pairing dialog.
Reproducible Rate: 100%
Root Cause:
PendingIntent created for showing pairing notification are getting
reused as only FLAG_ONE_SHOT is used. This flag is not updating new
extra's in the pending intent.
Fix:
Use flag FLAG_UPDATE_CURRENT in pending Intent.
Test: Tested above mentioned testcase and pairing scenarios.
Fix:
129479787
Bug:
129456113
Change-Id: I46813f355cd796cee1b472774b494c8580b39784
TreeHugger Robot [Mon, 8 Apr 2019 18:15:57 +0000 (18:15 +0000)]
Merge "Fix 'Advanced' collapse point on Network & internet page" into qt-dev
Andrew Sapperstein [Sat, 6 Apr 2019 00:21:46 +0000 (17:21 -0700)]
Delete carrier entry from mobile network details page.
Followup CL will need to delete the backing code after we remove the feature flag.
Bug:
127540176
Test: robotests and visual inspection
Change-Id: I17e917b9726cf7f5470af09332ede38f8c253eed
TreeHugger Robot [Mon, 8 Apr 2019 15:03:58 +0000 (15:03 +0000)]
Merge "Fix battery color tint issue." into qt-dev
Svetoslav Ganov [Mon, 8 Apr 2019 14:54:03 +0000 (14:54 +0000)]
Merge "Update Settings to use the proper DeviceConfig API." into qt-dev
Arc Wang [Mon, 8 Apr 2019 11:56:45 +0000 (19:56 +0800)]
Remove the PreferenceGroup without title in WifiNetworkDetailsFragment
To remove the PreferenceGroup title space.
Bug:
129683066
Test: manual
Change-Id: I00bced8038a01c0ef7e8f4dfa0b82e36a275004e
tmfang [Tue, 19 Mar 2019 05:44:01 +0000 (13:44 +0800)]
Improve launch time for app & notification screen
- We won't query recent apps in getAvailabilityStatus().
And then we do that in background thread.
So, we can launch app & notificatins screen as soon as possible.
- Create a RecentAppStatsMixin class which is responsible
for maintaining the recent apps data.
- Controllers and fragment update their UI after they got
onReloadDataCompleted callback from RecentAppStatsMixin.
Test: manual, robotest
Fixes:
128849426
Fixes:
126453868
Change-Id: I636d5878cb5d53496978fe613c625382d8d382bc
Svet Ganov [Sat, 6 Apr 2019 02:00:05 +0000 (19:00 -0700)]
Update Settings to use the proper DeviceConfig API.
Exempt-From-Owner-Approval: carry over approval from ag/
6908306
bug:
124769181
Change-Id: If18d0dc5e55dabf82b7c7a2b6df240fb8b24f736
cnchen [Wed, 3 Apr 2019 08:18:34 +0000 (16:18 +0800)]
Fix fingerprint screens from "Anything else" screen not applying Stencil theme
Bug:
129788677
Test: RunSettingsRoboTests, manual test intent extra data has been passed
Change-Id: Icfae54061e5d87a8ba9c95263d840c456aac5bcb
TreeHugger Robot [Sat, 6 Apr 2019 04:05:32 +0000 (04:05 +0000)]
Merge "Don't allow CBRS subscriptions to be set as default for Calls/SMS" into qt-dev
Christine Franks [Sat, 6 Apr 2019 01:25:41 +0000 (01:25 +0000)]
Merge "Use CDS display white balance getter and setter" into qt-dev
Amin Shaikh [Fri, 5 Apr 2019 19:14:10 +0000 (15:14 -0400)]
Fix battery color tint issue.
Added test to verify fix.
Bug:
128354921
Test: m RunSettingsRoboTests
Change-Id: I24cbb966e549eec783912e4e118c00425b971ad0
Antony Sargent [Fri, 5 Apr 2019 16:55:12 +0000 (09:55 -0700)]
Don't allow CBRS subscriptions to be set as default for Calls/SMS
CBRS subscriptions (also known as "opportunistic" in the code base) are
data-only and it should not be possible to try to set them as the
default for Calls or SMS.
Fixes:
125855327
Test: make RunSettingsRoboTests
Change-Id: Ie20ef21ccc7b27315089f6a61cceb6e1512ec373
TreeHugger Robot [Fri, 5 Apr 2019 23:36:07 +0000 (23:36 +0000)]
Merge "Clean up tts preference layout." into qt-dev
TreeHugger Robot [Fri, 5 Apr 2019 23:33:16 +0000 (23:33 +0000)]
Merge "Remove mainline module feature flag checks." into qt-dev
Linda Tseng [Fri, 5 Apr 2019 23:09:14 +0000 (23:09 +0000)]
Merge "Remove divider above device switcher in panel" into qt-dev
Bill Yi [Fri, 5 Apr 2019 22:47:28 +0000 (15:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
83d678bdc4 -s ours
am skip reason: subject contains skip directive
Change-Id: I273e17ee6cf94e6a6b7a3f6ed2a9b22c5a7a9992
TreeHugger Robot [Fri, 5 Apr 2019 21:39:05 +0000 (21:39 +0000)]
Merge "Update taskAffinity" into qt-dev
Christine Franks [Fri, 29 Mar 2019 17:14:55 +0000 (10:14 -0700)]
Use CDS display white balance getter and setter
Bug:
123930917
Test: make ROBOTEST_FILTER="(DisplayWhite*)" RunSettingsRoboTests -j48
Change-Id: Iafc6ff9a61b69baf03efddd52687093c55d35178
(cherry picked from commit
ebacc33852a34c73646a0df120efde73206ff3d1)
Fan Zhang [Fri, 5 Apr 2019 21:31:04 +0000 (14:31 -0700)]
Remove mainline module feature flag checks.
They are turned on for a while now.
Fixes:
123648279
Test: robotests
Change-Id: Ibec7a10d49387207697635190a237807f1807628
lindatseng [Fri, 5 Apr 2019 01:43:20 +0000 (18:43 -0700)]
Remove divider above device switcher in panel
Remove the divider above the media device switcher Slice per the request.
Do a little refactor in Panel View, to use DividerItemDecoration instead of adding
divider views in layout file as the recycler view items divider.
Since dividers should be shown in most cases, we are setting DividerCondition to
DIVIDER_CONDITION_BOTH and default true to allow divider. For the slice we don't
need divider (media device switch in this case) we are setting the the target
direction of isDividerAllowed (above in this case) to false. Since we have
DIVIDER_CONDITION_BOTH, if one of the item view set the divider not allow, the
divider won't be shown.
Test: Visual/Manual inspection
Fixes:
126205139
Change-Id: Ic857705c90819ef9375f877a44bb32987b5d4438
Fan Zhang [Fri, 5 Apr 2019 20:44:37 +0000 (13:44 -0700)]
Clean up tts preference layout.
Deleted the custom tts layout and use preference_radio directly.
Fixes:
129994473
Test: visual
Change-Id: Ifc50e0cf9f805776e0529ffd5d672283f28a1d15
TreeHugger Robot [Fri, 5 Apr 2019 20:05:40 +0000 (20:05 +0000)]
Merge "Fix sending broadcast with a qualified user in Settings" into qt-dev
Bill Yi [Fri, 5 Apr 2019 19:44:47 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I27c0efa466b676aafccb399704805959704fe165
Mill Chen [Fri, 5 Apr 2019 01:42:28 +0000 (18:42 -0700)]
Fix sending broadcast with a qualified user in Settings
Fixes:
118387886
Test: rebotests
Change-Id: I9e0bdd708b7c95f785f2b11d6d7e3f7818234ada
Lei Yu [Fri, 5 Apr 2019 17:11:34 +0000 (17:11 +0000)]
Merge changes Ib80d68d6,I0d57d5b2 into qt-dev
* changes:
Init PowerWhitelistbackend to stop crash
Create gitignore for Settings
TreeHugger Robot [Fri, 5 Apr 2019 16:38:08 +0000 (16:38 +0000)]
Merge "Add Settings icons needed for theme overlaying." into qt-dev
TreeHugger Robot [Fri, 5 Apr 2019 15:26:24 +0000 (15:26 +0000)]
Merge "Add bubble confirmation prompt" into qt-dev
Julia Reynolds [Mon, 1 Apr 2019 15:51:21 +0000 (11:51 -0400)]
Add bubble confirmation prompt
@ the app level if the global level is off
Test: robotests
Bug:
129068779
Change-Id: I94acb334dc9879cd372a2a0dfa8e9508fbf1c316
Amin Shaikh [Thu, 4 Apr 2019 11:48:16 +0000 (07:48 -0400)]
Add Settings icons needed for theme overlaying.
- Refactor battery icons to remove private attributes to allow them to
be overlayed
- Add drawable icon in settings for back arrow
- Update a few GM2 icons
Bug:
128354921
Test: make; open Settings
Change-Id: I84151a4e7d787381b6c51f02bb45ce5f15fa37a2
TreeHugger Robot [Fri, 5 Apr 2019 07:59:44 +0000 (07:59 +0000)]
Merge "Update wifi p2p to direct user to enable location" into qt-dev
Kevin Chyn [Fri, 5 Apr 2019 06:33:37 +0000 (06:33 +0000)]
Merge "Cache attention toggle in settings" into qt-dev
TreeHugger Robot [Fri, 5 Apr 2019 05:35:05 +0000 (05:35 +0000)]
Merge "Match add network button width to master switch and tint it." into qt-dev
TreeHugger Robot [Fri, 5 Apr 2019 03:19:22 +0000 (03:19 +0000)]
Merge "Add prompt to sign in at captive portal to Wi-Fi Slice" into qt-dev
TreeHugger Robot [Fri, 5 Apr 2019 03:17:18 +0000 (03:17 +0000)]
Merge "Customized Wifi calling text" into qt-dev
TreeHugger Robot [Fri, 5 Apr 2019 03:07:09 +0000 (03:07 +0000)]
Merge "Update char limit for reset_esim_title." into qt-dev
Fan Zhang [Fri, 5 Apr 2019 02:53:12 +0000 (02:53 +0000)]
Merge "DND should be displayed on search as slice." into qt-dev
Stanley Wang [Mon, 1 Apr 2019 11:20:54 +0000 (19:20 +0800)]
DND should be displayed on search as slice.
Add ZenModeSoundSettingsPreferenceController extends ZenModePreferenceController,
and update availability status to AVAILABLE.
This is cherry-picked from ag/
6897872
Change-Id: I8dcb6808cc21c4f5c06548a363c998e369646487
Bug:
129320642
Test: manual & robotests
TreeHugger Robot [Fri, 5 Apr 2019 01:16:23 +0000 (01:16 +0000)]
Merge "Update adaptive sleep setting with the latest copy" into qt-dev
Kevin Chyn [Fri, 5 Apr 2019 00:41:17 +0000 (00:41 +0000)]
Merge changes from topic "face-profile-qt-dev" into qt-dev
* changes:
Settings should be per-profile
Add face profile settings
TreeHugger Robot [Fri, 5 Apr 2019 00:35:24 +0000 (00:35 +0000)]
Merge "Add uri to custom slice PendingIntent." into qt-dev
TreeHugger Robot [Fri, 5 Apr 2019 00:28:29 +0000 (00:28 +0000)]
Merge "Update strings" into qt-dev
Kevin Chyn [Fri, 5 Apr 2019 00:24:09 +0000 (17:24 -0700)]
Cache attention toggle in settings
Bug:
129912479
Test: Builds
Change-Id: I23017f37d53e162c1a1ec35570355508276f90fa
Andrew Sapperstein [Fri, 5 Apr 2019 00:22:10 +0000 (17:22 -0700)]
Match add network button width to master switch and tint it.
It's now tinted in colorAccent.
Created a new default 80dp minWidth for TwoTargetPreferences.
Fixes:
129007966
Test: visual inspection
Change-Id: Ie751fe685d25373c3aac001e6e0daee8e18b9314
Salvador Martinez [Tue, 2 Apr 2019 01:17:04 +0000 (18:17 -0700)]
Update wifi p2p to direct user to enable location
Location is required for Wifi Direct so if it is not enabled
we disable the preference. Additionally, this fixes some minor
update issues in Wifi Wakeup that was also affecting wifi p2p.
Basically they weren't updating when location settings changed
until you left the screen and came back. Now they do.
Test: robotests, manual
Bug:
120552223
Change-Id: Ibd386fcfbef881cae3d871152675f1cab5e4a041
Fan Zhang [Thu, 4 Apr 2019 23:12:38 +0000 (16:12 -0700)]
Add uri to custom slice PendingIntent.
Discovered flashlight slice sometimes does not work, throwing exception
similar as it b/
117445451. Adding a data uri fixes it.
Bug:
129981692
Test: manual
Change-Id: I16bc19027dd342f85aaabbf1a2853bb55564f64f
Mill Chen [Thu, 4 Apr 2019 22:39:27 +0000 (15:39 -0700)]
Update taskAffinity
To make sure Settings won't open unexpectedly.
Fixes:
129330530
Test: visual
Change-Id: Iaa0e0a6a03720b1a0be49d0e1f752d3a7164f4a2
Kevin Chyn [Thu, 4 Apr 2019 02:47:31 +0000 (19:47 -0700)]
Settings should be per-profile
Also, don't show keyguard option for work profile
Fixes:
129905061
Test: Builds
Change-Id: I18f573f39ee4e54a3385cc65079bb794633cc560
Michael Groover [Wed, 3 Apr 2019 22:03:42 +0000 (15:03 -0700)]
Use Settings instead of DeviceConfig to relax device ID dev option
The 'Disable device identifier restrictions' developer option
currently uses DeviceConfig to set whether the new access
restrictions should be disabled. However this API now requires
the WRITE_DEVICE_CONFIG permission and should only be used from
the server side. This change modifies the developer option to use the
Settings to relax the device identifier check, and the option will
be hidden if the new restrictions have been disabled from the server.
Bug:
129888611
Test: Manually verified device ID check was relaxed with option
enabled. Also verified option is not displayed if DeiviceConfig
option is set.
Change-Id: Id8759f2219e702c1f93a638d45ac99bce685383b
(cherry picked from commit
60c80bb2953892f8bd423a0b2b1d83ca4741c222)
Lei Yu [Thu, 4 Apr 2019 19:53:55 +0000 (12:53 -0700)]
Init PowerWhitelistbackend to stop crash
Also update text to "unavailable" to reflect its current status.
Fixes:
129955147
Test: Manual
Change-Id: Ib80d68d6d2b6bc4ced4a72483859e675b7e7e61c
Kevin Chyn [Wed, 3 Apr 2019 21:51:17 +0000 (14:51 -0700)]
Add face profile settings
Fixes:
110907543
Test: Builds
Change-Id: I9761f289bb250c5d9f5b5e75cf682d164c591050
Lei Yu [Thu, 4 Apr 2019 19:49:15 +0000 (12:49 -0700)]
Create gitignore for Settings
Fixes:
129973953
Test: Manual
Change-Id: I0d57d5b2fe161d150605854cbe7fe62494390a3e
Fan Zhang [Wed, 3 Apr 2019 22:46:59 +0000 (15:46 -0700)]
Update strings
Fixes:
129885706
Fixes:
129855545
Test: visual
Change-Id: I655655033c019de4365de9fe208c8c362134dfe3
Alex Salo [Tue, 2 Apr 2019 21:24:07 +0000 (14:24 -0700)]
Update adaptive sleep setting with the latest copy
Bug:
129352433
Change-Id: I3c9594f9ed49208ef1d7bbc33e8083a0c733b1f8
Test: manually confirmed it works and looks correct
(cherry picked from commit
fdeb07c05bf44e428ecbd5c315627735cb7afc05)
Antony Sargent [Thu, 4 Apr 2019 17:10:31 +0000 (10:10 -0700)]
Fix 'Advanced' collapse point on Network & internet page
On the Network & internet page, we want to collapse all the prefs into
'Advanced' that appear after 'Data Saver'. The mechanism for specifying
where the collapse point starts is just a static count, and it doesn't
really understand the concept of dynamically added preferences like the
ones we add at the top when the device is in DSDS mode. To fix this in
the short term, this CL makes the header that manages these prefs
manually adjust the count as needed. In the future we'd like to have a
better mechanism for this added in the support library.
Fixes:
128855968
Test: make RunSettingsRoboTests
Change-Id: I4509726ff29bc71e1f0b3d4a2f60dffe4b1dd7ac
jackqdyulei [Wed, 3 Apr 2019 22:43:28 +0000 (15:43 -0700)]
Customized Wifi calling text
This only fixed in old page from aosp/777974. We need to migrate
it to new preference controller
Fixes:
117257109
Test: Manual
Change-Id: I257be10d7cc1fc4a91ee0df404dd69b4d2ee8ae2
(cherry picked from commit
acacaf44d3e5c8d27c6b16a910e5dba83ca82526)
Jason Chiu [Tue, 2 Apr 2019 05:57:29 +0000 (13:57 +0800)]
Add prompt to sign in at captive portal to Wi-Fi Slice
- Support signing in captive portal APs in WifiSlice
- Show ContextualWifiSlice when signing in is required
- Generifies SliceBackgroundWorker.getInstance() to return <T extends SliceBackgroundWorker>
Fixes:
128056349
Test: make RunSettingsRoboTests -j
Change-Id: Ib4d3942591a65e81018389e4c0bbddfea6854dbc
(cherry picked from commit
dd9f92280bac5c86c6a3ac3fbebcd5d5ff510f13)
Andrew Sapperstein [Tue, 2 Apr 2019 19:25:51 +0000 (12:25 -0700)]
Update char limit for reset_esim_title.
Fixes:
129711512
Test: verified manually with larger string.
Change-Id: I802ed901ad65d79dbe761929467607f5e783be9e
Rich Cannings [Thu, 4 Apr 2019 07:17:57 +0000 (00:17 -0700)]
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
am:
5d9189fab2 -s ours
am skip reason: subject contains skip directive
Change-Id: Id431f40576a5375d541b4b41d2880ac0c9ac7519
Rich Cannings [Thu, 4 Apr 2019 06:56:43 +0000 (23:56 -0700)]
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[]
am:
34042bbf1d -s ours
am skip reason: subject contains skip directive
Change-Id: I903bcc9500ea4732fdacd9f7c77538ba8390f34d
Xiangyu/Malcolm Chen [Thu, 4 Apr 2019 00:15:19 +0000 (17:15 -0700)]
[automerger skipped] Merge "Clean up a few names of Telephony intent extra." am:
6bb737c5b9 am:
681bf8a664
am:
37683154b4 -s ours
am skip reason: change_id I5d47b132abb722282bd10b9fbb362fb1f1d32f11 with SHA1
f2fca31c51 is in history
Change-Id: I8d45b26d7863190ddf51a8e8a5e86b4acfbde816
Bill Rassieur [Wed, 3 Apr 2019 23:59:32 +0000 (16:59 -0700)]
Merge master@
5406228 into git_qt-dev-plus-aosp.
am:
d09106b207
Change-Id: I9de6ed0dae680c55f3f1396cb8fbc95c6a77f9a3
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:50:20 +0000 (16:50 -0700)]
Merge "Clean up a few names of Telephony intent extra." am:
6bb737c5b9
am:
681bf8a664
Change-Id: I8576bf49c27620f873c501d3bf837ec0b0b3e679
Kevin Chyn [Wed, 3 Apr 2019 23:46:14 +0000 (23:46 +0000)]
Merge "Set/Get features with new interface"
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:25:05 +0000 (16:25 -0700)]
Merge "Clean up a few names of Telephony intent extra."
am:
6bb737c5b9
Change-Id: I1a2232458ab8fd4a89c1ada1e5195bf346e31074
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:06:47 +0000 (23:06 +0000)]
Merge "Clean up a few names of Telephony intent extra."
Lei Yu [Wed, 3 Apr 2019 22:45:28 +0000 (22:45 +0000)]
Merge "Move telephony method to worker thread"
jackqdyulei [Wed, 3 Apr 2019 00:27:41 +0000 (17:27 -0700)]
Move telephony method to worker thread
Get bug complaining it blocks UI even though it works fine some devices.
This CL moves methods to worker thread and keep progressbar
shown at least for 1 second, to avoid janky UI.
Fixes:
129329645
Test: RunSettingsRoboTests
Change-Id: Iee51949b7f6dfe2ede0fc4e6cd0f7b96d7199081
Chen Xu [Wed, 3 Apr 2019 22:17:46 +0000 (22:17 +0000)]
Merge "SDK API doesSwitchModemConfigTriggerReboot"
TreeHugger Robot [Wed, 3 Apr 2019 22:07:38 +0000 (22:07 +0000)]
Merge "Add tests for ContextualCardManager."
Kevin Chyn [Wed, 3 Apr 2019 03:01:05 +0000 (20:01 -0700)]
Set/Get features with new interface
Bug:
127382095
Test: Builds
Change-Id: Ideb252989a49eec88b8ee7f3ce6ea4f9d85bb3bc
TreeHugger Robot [Wed, 3 Apr 2019 21:17:45 +0000 (21:17 +0000)]
Merge "Add tests for ContextualCardsAdapter."
TreeHugger Robot [Wed, 3 Apr 2019 20:48:23 +0000 (20:48 +0000)]
Merge "Add a flashlight handler activity to support indexability."
TreeHugger Robot [Wed, 3 Apr 2019 20:41:21 +0000 (20:41 +0000)]
Merge "Disable "Battery dialog" for default apps"
TreeHugger Robot [Wed, 3 Apr 2019 19:42:25 +0000 (19:42 +0000)]
Merge "Convert xml based API allowDynamicSummaryInSlice to java"
Fan Zhang [Tue, 2 Apr 2019 23:41:01 +0000 (16:41 -0700)]
Add a flashlight handler activity to support indexability.
Fixes:
128465925
Fixes:
123711093
Test: reindex
Change-Id: Ie082e65ee070f6143c4c65db3f70615b16af0e52
chen xu [Wed, 3 Apr 2019 17:31:19 +0000 (10:31 -0700)]
SDK API doesSwitchModemConfigTriggerReboot
Bug:
129424775
Change-Id: I95045f8e2c572a9ee7e8f402568e72ac02a2d1be
clownshen [Mon, 1 Apr 2019 13:27:14 +0000 (21:27 +0800)]
Add Wi-Fi data usage field
Add Wi-Fi data usage field at Wi-Fi Setting to show out the total Wi-Fi
data usage for user.
Bug:
129474341
Test: atest WifiSettingsTest
Test: manual test
Change-Id: Iad5bee47bd83ed143a2730f042d77907344f4017
Cn Chen [Wed, 3 Apr 2019 15:36:47 +0000 (15:36 +0000)]
Merge "Pass back number of fingerprint enrolled from settings to SUW"
TreeHugger Robot [Wed, 3 Apr 2019 11:47:38 +0000 (11:47 +0000)]
Merge "Remove unused method from NotificationChannelSlice"