OSDN Git Service
Andrew Sapperstein [Fri, 28 Jun 2019 17:43:13 +0000 (10:43 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev am:
72aded338a
am:
647f685063
Change-Id: I2e1f86871882063de4b4627e80c9327d2338b4e7
Andrew Sapperstein [Fri, 28 Jun 2019 17:32:22 +0000 (10:32 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev
am:
72aded338a
Change-Id: I93faf2c99489405fe82a75adf24f4d885bbe1558
Andrew Sapperstein [Fri, 28 Jun 2019 16:56:04 +0000 (16:56 +0000)]
Merge "Add UI for mainline modules licenses." into qt-dev
Yanting Yang [Fri, 28 Jun 2019 14:34:11 +0000 (07:34 -0700)]
Fix RTL issue of Deferred Setup card
am:
f6972b29b1
Change-Id: Ib90d60e14dce7a3bafec01170994485752dd632c
Yanting Yang [Thu, 27 Jun 2019 13:20:12 +0000 (21:20 +0800)]
Fix RTL issue of Deferred Setup card
Correct layout gravity to "start" to apply RTL layout.
Fixes:
131913172
Test: visual
Change-Id: I5935c5c1415070803141634ff4e92f1c65fc94f6
(cherry picked from commit
c200df360cc5dfb29a649ebbba7a632c77408e3d)
Winson Chung [Thu, 27 Jun 2019 23:44:58 +0000 (16:44 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am:
9591c3f963
am:
8d08713c96
Change-Id: I565145cdcb2344737e2455ce819e831aefa8798f
Winson Chung [Thu, 27 Jun 2019 23:23:53 +0000 (16:23 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am:
9591c3f963
Change-Id: I45e8c0e6e3caa9551646c0d26eac1a78a2fa56cd
Winson Chung [Thu, 27 Jun 2019 22:47:14 +0000 (22:47 +0000)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
Evan Severson [Thu, 27 Jun 2019 21:32:34 +0000 (14:32 -0700)]
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
am:
f461d8dc52
Change-Id: I4729bdde26d5953839a623cd9ea483a387a5d901
Joel Galenson [Thu, 27 Jun 2019 21:32:33 +0000 (14:32 -0700)]
Remove Permissions Hub. DO NOT MERGE
am:
69d9899868
Change-Id: Id79ab681beaad7aca73d6f234b739470b85e19cd
Evan Severson [Thu, 27 Jun 2019 21:21:56 +0000 (21:21 +0000)]
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
Amin Shaikh [Thu, 27 Jun 2019 20:37:56 +0000 (13:37 -0700)]
Update Settings overlayed icons.
am:
c477507f4e
Change-Id: I58e03056f7bd1f61b089c3fb60c17f8afc7a8488
Amin Shaikh [Thu, 23 May 2019 15:23:46 +0000 (11:23 -0400)]
Update Settings overlayed icons.
- Use tint instead of custom fillColor to be consistent with overlays.
- Update list of overlayed icons.
Bug:
131346125
Test: make
Change-Id: Ib548c0b47db0064bcb1536c9b7a650912f28273f
Merged-In: Ib548c0b47db0064bcb1536c9b7a650912f28273f
Louis Chang [Thu, 27 Jun 2019 01:57:54 +0000 (09:57 +0800)]
Adding unique task affinity for FallbackHome activity
Settings activities were launched and resided on home task
which was originally started by FallbackHome. Adding a
unique task affinity for FallbackHome activity in order to
prevent the task being reused by other Settings activities.
Bug:
135696366
Test: starting Settings activity before FallbackHome finishes
Change-Id: I3fe41dd3b77e37236b11006dbf08727783b6a2ec
Joel Galenson [Thu, 30 May 2019 15:30:49 +0000 (08:30 -0700)]
Remove Permissions Hub. DO NOT MERGE
Bug:
132292477
Test: View all related screens.
(cherry picked from commit
1e7c172ad5704754266bee50a9bc59b3205e8b70)
This should have been submitted with ag/
8109287
Bug:
136012133
Test: Clicked through permission screens on cuttlefish
Change-Id: I2663aa365baf78ccc6f0a3d585b09da0dd387970
Sunny Shao [Wed, 26 Jun 2019 11:43:25 +0000 (04:43 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev am:
5a69fac694
am:
bfffb2ae74
Change-Id: Iac5fbc9c5486a7ea4db51bfc2cccc10cd8cd37e0
Sunny Shao [Wed, 26 Jun 2019 11:35:26 +0000 (04:35 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev
am:
5a69fac694
Change-Id: I085502786e8883c7ffb346592bfebc1a3bb08209
TreeHugger Robot [Wed, 26 Jun 2019 11:15:35 +0000 (11:15 +0000)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev
Antony Sargent [Wed, 26 Jun 2019 06:11:15 +0000 (23:11 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev am:
3288037bd2
am:
fb52368873
Change-Id: I86d589bc1304c625da724c122dd083691fa46447
Antony Sargent [Wed, 26 Jun 2019 06:02:14 +0000 (23:02 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
am:
3288037bd2
Change-Id: I5833f9ece2590b16ef3184f8d315fd092f683207
TreeHugger Robot [Wed, 26 Jun 2019 05:35:29 +0000 (05:35 +0000)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
Bill Yi [Wed, 26 Jun 2019 05:20:09 +0000 (22:20 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
9905cc9b50 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibe77e3e737a791657ce507dd56b5dc9f86de40e3
TreeHugger Robot [Wed, 26 Jun 2019 04:00:28 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Joshua Mccloskey [Wed, 26 Jun 2019 01:53:40 +0000 (18:53 -0700)]
Merge "Adding slice for Face Enrollment" into qt-r1-dev
am:
35252d1b9f
Change-Id: I93e1619aed2080d9a08891e5d57c37b1a6423a7d
Joshua Mccloskey [Wed, 26 Jun 2019 01:15:50 +0000 (01:15 +0000)]
Merge "Adding slice for Face Enrollment" into qt-r1-dev
Vishwath Mohan [Wed, 26 Jun 2019 00:01:31 +0000 (17:01 -0700)]
Change fingerprint reference to biometric for lockdown
am:
947a93ea75
Change-Id: I638ee2644283c20d5538ec3ed91266227b82044e
Andrew Sapperstein [Tue, 18 Jun 2019 16:44:18 +0000 (09:44 -0700)]
Add UI for mainline modules licenses.
Added a module licenses option that lives in Legal information settings.
Clicking that option opens module licenses page, which displays every
module by name, filtered to exclude modules without license files.
Clicking a module in the list opens HTMLViewer.
Created ModuleLicensesProvider, a new ContentProvider that serves as a
redirect for the Uris sent to HTMLViewer so that they open asset files.
In order to provide the redirect, the provider will write the license file
to a file in Settings' cache directory when the license does not exist
in the cache or is outdated. The provider then opens that cached file.
Fixes:
135183006
Test: robotests
Change-Id: I7d69da34780c8c4efb150d0c0411078c12bc80d8
Bill Yi [Tue, 25 Jun 2019 22:43:36 +0000 (15:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
134640169
Change-Id: Ifd9077857dbae28a18cf494a4c318669ec2b1519
Antony Sargent [Tue, 25 Jun 2019 21:01:36 +0000 (14:01 -0700)]
Check isWfcProvisionedOnDevice in WifiCallingSettings
On the SIM details page, the preference leading to a page for
configuring wifi calling will appear based on the results of the
MobileNetworkUtils#isWifiCallingEnabled helper function. That helper
uses the ImsManager to check several conditions, among them both
isWfcEnabledByPlatform and isWfcProvisionedOnDevice.
The page for configuring wifi calling has a tabbed UX, with one tab for
each active subscription that supports it. The WifiCallingSettings class
gets a list of the active subscriptions to determine which tabs to show,
and removes any that don't support wifi calling, but was only using the
isWfcEnabledByPlatform test to do so. This is a problem because the code
for showing the contents inside the tab, in WifiCallingSettingsForSub,
includes a sanity check of isWfcProvisionedOnDevice and calls finish()
if that returns false.
What this meant in practice is that if you happened to have 2
subscriptions where one returns true for both isWfcEnabledByPlatform and
isWfcProvisionedOnDevice, but the other only returned true for
isWfcEnabledByPlatform, then you'd never be able to succesfully use the
wifi calling page at all because the tab for the subscription you
*aren't* trying to configure would always call finish() early.
The right long term solution to this problem is probably to remove the
tabbed UX entirely from this page, since we probably don't need it given
the overall new multi-SIM UX. But there may still be legacy uses and
that is likely a bigger change than we want to make right now.
As a stopgap, this CL just adds a check of isWfcProvisionedOnDevice to
the code for filtering out ineligible subscriptions from the tabbed
interface, which we should have always had anyway.
Fixes:
135591718
Test: make RunSettingsRoboTests
Change-Id: I656c3d3fb30cb6fabcb86685eae38c5f0cd0c6f2
Bill Yi [Tue, 25 Jun 2019 20:54:17 +0000 (13:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
01d889815d -s ours
am skip reason: subject contains skip directive
Change-Id: I0d72ad4df778c60fc79b9a9ff213d999ba52dabb
Vishwath Mohan [Tue, 25 Jun 2019 20:39:58 +0000 (13:39 -0700)]
Change fingerprint reference to biometric for lockdown
Changes the lockdown description to reference biometric unlocks more
generally, and not just fingerprint unlock.
Bug:
135282412
Test: The string for lockdown does not refer to fingerprint
Change-Id: I8f1cf43bc8d42288d96a272b3243a7863c8d4941
TreeHugger Robot [Tue, 25 Jun 2019 19:24:19 +0000 (19:24 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Antony Sargent [Tue, 25 Jun 2019 19:02:56 +0000 (12:02 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev am:
87fadeeb4a
am:
48c61f173d
Change-Id: Id9d90c2d8c8b9362fc8d765626c3bf46413a651b
Antony Sargent [Tue, 25 Jun 2019 18:44:50 +0000 (11:44 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
am:
87fadeeb4a
Change-Id: Ib32dca04f573f3d84f77215c5ab891cb873072af
TreeHugger Robot [Tue, 25 Jun 2019 17:54:54 +0000 (17:54 +0000)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
Bill Yi [Tue, 25 Jun 2019 17:33:04 +0000 (10:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6a0682180e39156f0959521d47ec707c8da28819
Bill Yi [Tue, 25 Jun 2019 16:12:11 +0000 (09:12 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
279050c8d6 -s ours
am:
a5830871e2 -s ours
am skip reason: subject contains skip directive
Change-Id: Idf035b9a914825a6ec86464bcdc500ede6569875
Bill Yi [Tue, 25 Jun 2019 15:57:36 +0000 (08:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
279050c8d6 -s ours
am skip reason: subject contains skip directive
Change-Id: I60113754c64466c9729ef69156de47efcf8f775c
TreeHugger Robot [Tue, 25 Jun 2019 14:46:00 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Tue, 25 Jun 2019 11:07:28 +0000 (04:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I275c2124cebaca1f069837b138a01b9e11f77c55
Mehdi Alizadeh [Tue, 25 Jun 2019 01:01:46 +0000 (18:01 -0700)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am:
32d16291de
am:
453222d6c6
Change-Id: I3c60bffc1948bc4057199af031ada349fde3570e
joshmccloskey [Wed, 19 Jun 2019 22:51:56 +0000 (15:51 -0700)]
Adding slice for Face Enrollment
Fixes:
134965754
Test: Verified slice appears when not enrolled.
Test: Verified slice does not appear when enrolled.
Test: Verified slice disappears after clicking on icon and going back
to settings page.
Change-Id: Id1c4458742ab622df8d5881e926fe54684b36843
Mehdi Alizadeh [Tue, 25 Jun 2019 00:39:26 +0000 (17:39 -0700)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
am:
32d16291de
Change-Id: I1e37f368a64f2a0abeab0e0141e20b6ae98b5b9d
Mehdi Alizadeh [Tue, 25 Jun 2019 00:09:06 +0000 (00:09 +0000)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
Hai Zhang [Mon, 24 Jun 2019 21:33:18 +0000 (14:33 -0700)]
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev am:
b39810f5ab
am:
636920da48
Change-Id: Id49a4f2fbf14b10951906d931ecdd5bac0311365
Hai Zhang [Mon, 24 Jun 2019 21:28:54 +0000 (14:28 -0700)]
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
am:
b39810f5ab
Change-Id: Ia72e4fb5d1a7c930657ca26f15c58cd39220fe5e
TreeHugger Robot [Mon, 24 Jun 2019 21:19:17 +0000 (21:19 +0000)]
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
Hai Zhang [Fri, 21 Jun 2019 20:54:29 +0000 (20:54 +0000)]
Revert "Add special apps access settings page for financial app."
This reverts commit
43374eabb8669b79c734da49177b9ed1a7651237.
Reason for revert: No longer needed because we are using whitelist for
SMS permission
Fixes:
135213238
Test: presubmit
Change-Id: I182be4a1136521f325866e70e875439c17816ef2
Mehdi Alizadeh [Fri, 21 Jun 2019 01:12:11 +0000 (18:12 -0700)]
Adds metrics categories for gesture navigation dialogs
Bug:
135211145
Test: Builds
Change-Id: I9231778072bb222142fca09275cd84b87a263fa6
Fabian Kozynski [Mon, 24 Jun 2019 20:11:42 +0000 (13:11 -0700)]
Merge "Fix Dark theme case" into qt-dev am:
5bfb9f3240
am:
6993ee0333
Change-Id: I28ad7d56debe351f973047aad8ba95888f061c4c
Fabian Kozynski [Mon, 24 Jun 2019 20:01:23 +0000 (13:01 -0700)]
Merge "Fix Dark theme case" into qt-dev
am:
5bfb9f3240
Change-Id: I1c6a4a3c9c0c8e4daab6b33152e8bd2b3631072a
Fabian Kozynski [Mon, 24 Jun 2019 19:03:16 +0000 (19:03 +0000)]
Merge "Fix Dark theme case" into qt-dev
Antony Sargent [Wed, 19 Jun 2019 18:30:33 +0000 (11:30 -0700)]
Add a listener for subscription changes to SimDialogFragment
For some kinds of telephony changes that might happen while we're
already showing one of these dialogs, we already get sent a new intent
for the dialog which we internally convert into a refresh of the dialog
contents instead of stacking a new copy on top of the old one.
But it turns out there are some other cases where the telephony stack
doesn't send a new intent for the dialog but *does* send a change event
through the SubscriptionManager, and we want to respond to those as
well. This CL adds a listener for those events.
Fixes:
135276696
Test: make RunSettingsRoboTests
Change-Id: Ifb93ae95f45fda5831e112306dd9361ccaa5119c
(cherry picked from commit
6a1d7e60ac3593ce46c12dab0066a10149ca4aac)
Fabian Kozynski [Mon, 24 Jun 2019 14:07:17 +0000 (10:07 -0400)]
Fix Dark theme case
Test: manual
Fixes:
135711083
Change-Id: I91941466b98bbb08d17897784d90a4f467b4de5f
Yi Jiang [Sat, 22 Jun 2019 00:22:19 +0000 (17:22 -0700)]
Merge "Refresh camera permission status when it changed." into qt-r1-dev
am:
e342579993
Change-Id: I5ecf20062f59c100f984e81bbd26edf3340d64f3
Yi Jiang [Fri, 21 Jun 2019 23:59:21 +0000 (23:59 +0000)]
Merge "Refresh camera permission status when it changed." into qt-r1-dev
Yi Jiang [Tue, 18 Jun 2019 18:51:30 +0000 (11:51 -0700)]
Refresh camera permission status when it changed.
Bug:
135497543
Test: Manually tested
Change-Id: I833e1658bc7888557635b764599c7a0baa226612
Julia Reynolds [Fri, 21 Jun 2019 17:18:57 +0000 (10:18 -0700)]
Remove dead code am:
ab63fd3c25
am:
bf35e5cc55
Change-Id: I26d668f809712749249ab0e8f8fda8566929e17b
Julia Reynolds [Fri, 21 Jun 2019 17:15:12 +0000 (10:15 -0700)]
Remove dead code
am:
ab63fd3c25
Change-Id: I8d629b89f8b8145e8381301d888aeb8b050123c8
Julia Reynolds [Thu, 20 Jun 2019 12:51:11 +0000 (08:51 -0400)]
Remove dead code
Test: try to search 'gentle'
Fixes:
135640138
Change-Id: If03703e59f77206da08fc80e88bb986f821c18fe
Ivan Podogov [Thu, 20 Jun 2019 23:08:02 +0000 (16:08 -0700)]
Fix Settings crash when trying to show work policy info am:
242ff568d1
am:
f256fbb742
Change-Id: I0933c1ded0eb34ff5a4581448cafe59762451f9d
Ivan Podogov [Thu, 20 Jun 2019 22:33:39 +0000 (15:33 -0700)]
Fix Settings crash when trying to show work policy info
am:
242ff568d1
Change-Id: I5b003b9a94610b1ef7f2242c144ad0b360fcfc4a
Edgar Wang [Thu, 20 Jun 2019 20:15:07 +0000 (13:15 -0700)]
Merge "Update System->Gesture icon" into qt-r1-dev
am:
dfb1b6821b
Change-Id: I326be2ebc35cd9e35080562bcffaaff2f7cbd2c8
TreeHugger Robot [Thu, 20 Jun 2019 17:43:08 +0000 (17:43 +0000)]
Merge "Update System->Gesture icon" into qt-r1-dev
Ivan Podogov [Thu, 20 Jun 2019 15:01:29 +0000 (16:01 +0100)]
Fix Settings crash when trying to show work policy info
This fixes an exception in startActivity() call:
"android.util.AndroidRuntimeException: Calling startActivity() from outside of
an Activity context requires the FLAG_ACTIVITY_NEW_TASK flag. Is this really
what you want?"
Bug:
132904820
Test: manual
Change-Id: I0c687ea76068778554b072b6cc8274352de6fa28
Raff Tsai [Thu, 20 Jun 2019 06:15:30 +0000 (23:15 -0700)]
Merge "Cannot switch between multiple TTS engines" into qt-dev am:
753215fff9
am:
72b48c91f8
Change-Id: I9247b40fccb33f465693d64af29423a0c15b05bc
Raff Tsai [Thu, 20 Jun 2019 05:57:06 +0000 (22:57 -0700)]
Merge "Cannot switch between multiple TTS engines" into qt-dev
am:
753215fff9
Change-Id: Ia48e40c15b7c07e538e87e3c7ec242543c9f0d8c
TreeHugger Robot [Thu, 20 Jun 2019 04:42:23 +0000 (04:42 +0000)]
Merge "Cannot switch between multiple TTS engines" into qt-dev
Edgar Wang [Thu, 20 Jun 2019 04:10:30 +0000 (12:10 +0800)]
Update System->Gesture icon
Fixes:
135137464
Test: manual
Change-Id: I3de871882d74c2d6f4c5b1ce8e7ee65de9276a0c
Arc Wang [Thu, 20 Jun 2019 03:05:29 +0000 (20:05 -0700)]
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev am:
d64b6c8846
am:
051d4c9b81
Change-Id: I4ead4b5896ac1c60b77d50d5df9c5cb55202c91c
Arc Wang [Thu, 20 Jun 2019 02:46:32 +0000 (19:46 -0700)]
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev
am:
d64b6c8846
Change-Id: I65823cfc154a90a5a35e0932f4f1fe878718a274
Antony Sargent [Thu, 20 Jun 2019 02:19:17 +0000 (19:19 -0700)]
Add a listener for subscription changes to SimDialogFragment
am:
6a1d7e60ac
Change-Id: I3cfd603b9ea11e00a752a2bb74b8de4d355e921a
Arc Wang [Thu, 20 Jun 2019 01:34:09 +0000 (01:34 +0000)]
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev
Antony Sargent [Wed, 19 Jun 2019 18:30:33 +0000 (11:30 -0700)]
Add a listener for subscription changes to SimDialogFragment
For some kinds of telephony changes that might happen while we're
already showing one of these dialogs, we already get sent a new intent
for the dialog which we internally convert into a refresh of the dialog
contents instead of stacking a new copy on top of the old one.
But it turns out there are some other cases where the telephony stack
doesn't send a new intent for the dialog but *does* send a change event
through the SubscriptionManager, and we want to respond to those as
well. This CL adds a listener for those events.
Fixes:
135276696
Test: make RunSettingsRoboTests
Change-Id: Ifb93ae95f45fda5831e112306dd9361ccaa5119c
Arc Wang [Wed, 19 Jun 2019 17:24:08 +0000 (10:24 -0700)]
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev am:
d8916ef151
am:
3454468111
Change-Id: Ic192e361b65b758d7e143d3b995ca86e30b3256d
Arc Wang [Wed, 19 Jun 2019 17:15:44 +0000 (10:15 -0700)]
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
am:
d8916ef151
Change-Id: I37b2fd97fbe952d9cdc214b364ff766231158d4d
TreeHugger Robot [Wed, 19 Jun 2019 16:54:35 +0000 (16:54 +0000)]
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
Raff Tsai [Wed, 19 Jun 2019 08:21:20 +0000 (16:21 +0800)]
Cannot switch between multiple TTS engines
That is caused by layout xml changes. The radio button was clickable
in old xml resource. But it is not clickable in new xml resource.
Therefore we can't receive click callback. Fixed by changing
Radio button state when preference is clicked.
Fixes:
135285101
Test: manual, make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.tts"
Change-Id: Idd7bf37d9ccbc1b56d41978d19dc05c8a81cc49a
Kevin Chyn [Wed, 19 Jun 2019 05:40:15 +0000 (22:40 -0700)]
Merge "Lockscreen bypass should be searchable" into qt-r1-dev
am:
411e99597f
Change-Id: I62aa3ebf75ad14a2d7308a25a813e64e8ce8daa3
TreeHugger Robot [Wed, 19 Jun 2019 05:05:43 +0000 (05:05 +0000)]
Merge "Lockscreen bypass should be searchable" into qt-r1-dev
Malcolm Chen [Wed, 19 Jun 2019 03:56:57 +0000 (20:56 -0700)]
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am:
0304f4d1ce
am:
cdae15bcc4
Change-Id: I439e6f7f2f4daeaeaf486b403a859331a40f7099
Matthew Fritze [Wed, 19 Jun 2019 03:53:55 +0000 (20:53 -0700)]
Merge "MobileData slice should be null if not-actionable" into qt-dev am:
e2ab7540a3
am:
60a1dc1609
Change-Id: I9d446483277b2c8866102f7281b4aad6d3117967
Malcolm Chen [Wed, 19 Jun 2019 03:28:40 +0000 (20:28 -0700)]
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
am:
0304f4d1ce
Change-Id: I9f91b0292b464e76db849163573031dba8bef5a1
Matthew Fritze [Wed, 19 Jun 2019 03:23:29 +0000 (20:23 -0700)]
Merge "MobileData slice should be null if not-actionable" into qt-dev
am:
e2ab7540a3
Change-Id: Ie4630b5927b93083e6b970cb67da04cbc19a2c50
Bill Yi [Wed, 19 Jun 2019 03:18:58 +0000 (20:18 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
304271b664 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic0825b48431b5e48cc22fa8dfe50ec9dff04dd36
TreeHugger Robot [Wed, 19 Jun 2019 03:11:25 +0000 (03:11 +0000)]
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
TreeHugger Robot [Wed, 19 Jun 2019 02:26:20 +0000 (02:26 +0000)]
Merge "MobileData slice should be null if not-actionable" into qt-dev
Arc Wang [Wed, 19 Jun 2019 02:01:17 +0000 (10:01 +0800)]
[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail
After a user uses Wi-Fi QR code scanner to scan a QR code of an unreachable
Wi-Fi network, the scanner does not recognize any QR code until the scanner is
restarted or back from a screen off state.
To restart QrCamera after a Wi-Fi QR code recognition, we should stop it before
start, otherwise the DecodeTask will not work.
Bug:
135225856
Test: Scan a Wi-Fi QR code of unreachable Wi-Fi network and
scan a Wi-Fi QR code of reachable Wi-Fi network, check
if the scanner recognizes QR code.
Change-Id: I0063c867d8e4046f184d02134bda842887c003a1
Kevin Chyn [Wed, 19 Jun 2019 01:55:20 +0000 (18:55 -0700)]
Lockscreen bypass should be searchable
Fixes:
135566785
Test: Searchable now
Change-Id: Idae804f77ea5b7680c2dbe585bfec5078bb56c8f
TreeHugger Robot [Wed, 19 Jun 2019 00:29:25 +0000 (00:29 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Malcolm Chen [Tue, 18 Jun 2019 21:01:45 +0000 (14:01 -0700)]
Replace isSubscriptionEnabled with isActiveSubId.
As we don't allow pSIM modem disablment, we should simply use isActiveSubId
to decide whether a subscription's preferences is changable. This will
avoid potential modem bugs that reports wrong modem status that result
in Setting's UX error.
Bug:
135222940
Test: manual and robo
Change-Id: I7cccf2fdab7c89d26dac4daad51cd5d6f3a90eba
Bill Yi [Tue, 18 Jun 2019 23:46:23 +0000 (16:46 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
d1defa1bdf -s ours
am:
38fba3b6d0 -s ours
am skip reason: subject contains skip directive
Change-Id: I518cf3dd3d4e95f2363039ed3a079600ab683794
Bill Yi [Tue, 18 Jun 2019 23:23:36 +0000 (16:23 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
d1defa1bdf -s ours
am skip reason: subject contains skip directive
Change-Id: I70bae5a8810c6007380091016d3883b8ddce224f
Antony Sargent [Tue, 18 Jun 2019 23:06:15 +0000 (16:06 -0700)]
Merge "Use displayName instead of operator name in MMS data notification" into qt-dev am:
40e9ffc2f0
am:
fa274596f0
Change-Id: I55b78412f19b54e51af36c23514f798e99b36d11
TreeHugger Robot [Tue, 18 Jun 2019 22:55:52 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Antony Sargent [Tue, 18 Jun 2019 22:42:04 +0000 (15:42 -0700)]
Merge "Use displayName instead of operator name in MMS data notification" into qt-dev
am:
40e9ffc2f0
Change-Id: I0e2e20de501b2a5b3ee8905e69dd3a6eca97d0b1
Kevin Chyn [Tue, 18 Jun 2019 22:16:53 +0000 (15:16 -0700)]
Merge "Retrieve help URL" into qt-r1-dev
am:
509d6bcf73
Change-Id: I5c91bf36d89d9463ac74db4b949deb6abe7af58a
Bill Yi [Tue, 18 Jun 2019 21:57:58 +0000 (14:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I59dd19e96657af24f4a38df050b39fcfeb5f3f40
Antony Sargent [Tue, 18 Jun 2019 21:54:33 +0000 (21:54 +0000)]
Merge "Use displayName instead of operator name in MMS data notification" into qt-dev
Antony Sargent [Mon, 17 Jun 2019 20:23:10 +0000 (13:23 -0700)]
Use displayName instead of operator name in MMS data notification
When the phone is in DSDS mode and the user tries to send an MMS message
from the SIM that isn't the default for data, we need to pop up a
notification letting them know that the action can't succeed unless they
turn on the advanced option to allow data use for MMS messages. This
notification was using the operator name instead of the subscription
display name, so it didn't reflect any renaming the user might have done
to keep track of their SIMs, which is obviously confusing especially if
they have two different SIMs for the same carrier. This CL switches to
using the subscription display name in this notification.
Fixes:
134771858
Test: make RunSettingsRoboTests
Change-Id: I6995bf9dd6d5e9544e26f0d8e30e97c4e73ab783