Commit Graph

52825 Commits

Author SHA1 Message Date
Bill Yi
6edf1646c1 [automerger skipped] Import translations. DO NOT MERGE
am: 13d6e13166 -s ours
am skip reason: subject contains skip directive

Change-Id: I3d8655c2b647674d28d223f5deb9b6d21b42d106
2019-07-09 17:17:49 -07:00
Bill Yi
13d6e13166 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1c15e397059f357be547ce32fcdbae885bff5925
2019-07-09 11:46:23 -07:00
Bill Yi
2759932e72 [automerger skipped] Import translations. DO NOT MERGE
am: 292e7ad110 -s ours
am skip reason: subject contains skip directive

Change-Id: I10718d202f97e6fb1d6c7855c50ae5e15d4e5278
2019-07-05 19:04:54 -07:00
Bill Yi
292e7ad110 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9307e8b79d695e33e0b76b36de1fefc21a0b835e
2019-07-05 14:38:28 -07:00
Bill Yi
479df9b529 [automerger skipped] Import translations. DO NOT MERGE
am: a0fb9000bb -s ours
am skip reason: subject contains skip directive

Change-Id: I53bbafb3bcf25c01d4b1bc45edb66398ca900e91
2019-07-03 16:19:58 -07:00
Bill Yi
a0fb9000bb Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6863ccbf2304c8bb2d7ee93b41386bff36e33a41
2019-07-02 23:30:20 -07:00
Neil Fuller
bf673318f1 Merge "Add tobiast@ to the OWNERS file" am: a931693721
am: 46e53e770c

Change-Id: I9229928c7e9895003869752df1602ed26b42b90e
2019-07-02 15:32:40 -07:00
Neil Fuller
46e53e770c Merge "Add tobiast@ to the OWNERS file"
am: a931693721

Change-Id: Id52f2dcd3755f4fbbd6f6918e993063aebc582ac
2019-07-02 10:13:36 -07:00
Xin Li
59b1a2f6bb [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 0a68e9bfe7 -s ours
am skip reason: subject contains skip directive

Change-Id: I075c4d89765d09a570e0150e486e85dc78772afc
2019-07-02 10:04:54 -07:00
Neil Fuller
a931693721 Merge "Add tobiast@ to the OWNERS file" 2019-07-02 14:27:55 +00:00
Neil Fuller
ca6542843c Add tobiast@ to the OWNERS file
Add tobiast@ to the OWNERS file as libcore TL.
Remove pszczepaniak@ as he hasn't been on libcore
for a while.

Test: None
Change-Id: I714d3448ed60006cb58a0f49e95b7b834a6aac36
2019-07-02 10:55:50 +01:00
Xin Li
0a68e9bfe7 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I298dd1232c7e304b5d2cd9fda59006d08026698a
2019-07-01 21:00:04 +00:00
Bill Yi
d1bdb4f72d [automerger skipped] Import translations. DO NOT MERGE
am: 26a2694bd3 -s ours
am skip reason: subject contains skip directive

Change-Id: I4c83a096d556894ace12a767de72ba62f6f3f587
2019-07-01 02:42:17 -07:00
Bill Yi
26a2694bd3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I047beafb83c4c8df261fb5ac7c49dd81cb4470e0
2019-06-30 14:58:27 -07:00
Andrew Sapperstein
0c1f7da25a Merge "Add UI for mainline modules licenses." into qt-dev
am: 72aded338a

Change-Id: I4a2b655f0a325194ec5aa242edaaf51095748bd7
2019-06-28 10:28:07 -07:00
Andrew Sapperstein
72aded338a Merge "Add UI for mainline modules licenses." into qt-dev 2019-06-28 16:56:04 +00:00
Winson Chung
8bf207bab6 Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am: 9591c3f963

Change-Id: Ie07033339ce3ed1ee57d5ab68e56b9a51135ac77
2019-06-27 16:24:53 -07:00
Winson Chung
9591c3f963 Merge "Adding unique task affinity for FallbackHome activity" into qt-dev 2019-06-27 22:47:14 +00:00
Louis Chang
397cdd6ead 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
2019-06-27 09:57:54 +08:00
Sunny Shao
27067657f2 Merge "Fixed the IllegalStateException on removing account" into qt-dev
am: 5a69fac694

Change-Id: I6d87742bd0925237cb73171561118e4bdd363b8a
2019-06-26 04:35:26 -07:00
TreeHugger Robot
5a69fac694 Merge "Fixed the IllegalStateException on removing account" into qt-dev 2019-06-26 11:15:35 +00:00
Antony Sargent
e4e1f08781 Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
am: 3288037bd2

Change-Id: I0edcbba1f4c19052daeb2e69c2dc36e839641d9f
2019-06-25 23:02:14 -07:00
TreeHugger Robot
3288037bd2 Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev 2019-06-26 05:35:29 +00:00
Andrew Sapperstein
56a8c33c1b 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
2019-06-25 16:01:38 -07:00
Antony Sargent
46d819272a 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
2019-06-25 14:16:53 -07:00
Antony Sargent
bc50fb8aef Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
am: 87fadeeb4a

Change-Id: I59e0e265a5e91bed12d7e786d4fdd3043c068fed
2019-06-25 11:40:48 -07:00
TreeHugger Robot
87fadeeb4a Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev 2019-06-25 17:54:54 +00:00
Bill Yi
dbe1a25abd [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 279050c8d6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibef4696cf7a55802d4a3edf66d0fb222b9089c1a
2019-06-25 08:57:36 -07:00
TreeHugger Robot
279050c8d6 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-25 14:46:00 +00:00
Bill Yi
fe1b808001 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I275c2124cebaca1f069837b138a01b9e11f77c55
2019-06-25 04:07:28 -07:00
Mehdi Alizadeh
5ea919fc4b Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
am: 32d16291de

Change-Id: I96cbfd9d4e7b3b96f6977958861ae913dfa5e8ec
2019-06-24 17:36:26 -07:00
Mehdi Alizadeh
32d16291de Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev 2019-06-25 00:09:06 +00:00
Hai Zhang
5f8c446f47 Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
am: b39810f5ab

Change-Id: I8ab0452cd656d25afe164dec49553512decfdcec
2019-06-24 14:28:54 -07:00
TreeHugger Robot
b39810f5ab Merge "Revert "Add special apps access settings page for financial app."" into qt-dev 2019-06-24 21:19:17 +00:00
Hai Zhang
71f2614736 Revert "Add special apps access settings page for financial app."
This reverts commit 43374eabb8.

Reason for revert: No longer needed because we are using whitelist for
SMS permission

Fixes: 135213238
Test: presubmit
Change-Id: I182be4a1136521f325866e70e875439c17816ef2
2019-06-24 21:11:36 +00:00
Mehdi Alizadeh
0c7fd9e406 Adds metrics categories for gesture navigation dialogs
Bug: 135211145
Test: Builds
Change-Id: I9231778072bb222142fca09275cd84b87a263fa6
2019-06-24 20:29:41 +00:00
Fabian Kozynski
5813622457 Merge "Fix Dark theme case" into qt-dev
am: 5bfb9f3240

Change-Id: I3970a16198bb1d023fdd62840e7078883d4726c5
2019-06-24 12:49:38 -07:00
Fabian Kozynski
5bfb9f3240 Merge "Fix Dark theme case" into qt-dev 2019-06-24 19:03:16 +00:00
Antony Sargent
45f0701380 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 6a1d7e60ac)
2019-06-24 16:58:40 +00:00
Fabian Kozynski
918bfa07ce Fix Dark theme case
Test: manual
Fixes: 135711083
Change-Id: I91941466b98bbb08d17897784d90a4f467b4de5f
2019-06-24 10:07:17 -04:00
Julia Reynolds
3370e6cfb9 Remove dead code
am: ab63fd3c25

Change-Id: Ie0ff97b0db868f4f5aff19c4d8da2a8fc2a5717d
2019-06-21 10:15:12 -07:00
Julia Reynolds
ab63fd3c25 Remove dead code
Test: try to search 'gentle'
Fixes: 135640138
Change-Id: If03703e59f77206da08fc80e88bb986f821c18fe
2019-06-21 13:24:05 +00:00
Ivan Podogov
9de5b04dea Fix Settings crash when trying to show work policy info
am: 242ff568d1

Change-Id: I2a048e75934dda54d4b495908f07016e9c00b674
2019-06-20 15:34:39 -07:00
Ivan Podogov
242ff568d1 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
2019-06-20 16:28:47 +01:00
Raff Tsai
2c01fb911c Merge "Cannot switch between multiple TTS engines" into qt-dev
am: 753215fff9

Change-Id: I5d399c7f653caf53041f1136948f4a8de457d7c5
2019-06-19 22:57:25 -07:00
TreeHugger Robot
753215fff9 Merge "Cannot switch between multiple TTS engines" into qt-dev 2019-06-20 04:42:23 +00:00
Arc Wang
9b971efd6b Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev
am: d64b6c8846

Change-Id: Icfa3b21e383182a127a1e633a671013c371ab105
2019-06-19 19:38:57 -07:00
Arc Wang
d64b6c8846 Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev 2019-06-20 01:34:09 +00:00
Arc Wang
c58b3aaf0f Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
am: d8916ef151

Change-Id: I360ff827ae8544d76c4411410172ace81bbcef56
2019-06-19 10:14:55 -07:00
TreeHugger Robot
d8916ef151 Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev 2019-06-19 16:54:35 +00:00