OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoMerge "Add UI for mainline modules licenses." into qt-dev
Andrew Sapperstein [Fri, 28 Jun 2019 17:28:07 +0000 (10:28 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev
am: 72aded338a

Change-Id: I4a2b655f0a325194ec5aa242edaaf51095748bd7

5 years agoMerge "Add UI for mainline modules licenses." into qt-dev
Andrew Sapperstein [Fri, 28 Jun 2019 16:56:04 +0000 (16:56 +0000)]
Merge "Add UI for mainline modules licenses." into qt-dev

5 years agoMerge "Adding unique task affinity for FallbackHome activity" into qt-dev
Winson Chung [Thu, 27 Jun 2019 23:24:53 +0000 (16:24 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am: 9591c3f963

Change-Id: Ie07033339ce3ed1ee57d5ab68e56b9a51135ac77

5 years agoMerge "Adding unique task affinity for FallbackHome activity" into qt-dev
Winson Chung [Thu, 27 Jun 2019 22:47:14 +0000 (22:47 +0000)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev

5 years agoAdding unique task affinity for FallbackHome activity
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

5 years agoMerge "Fixed the IllegalStateException on removing account" into qt-dev
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: I6d87742bd0925237cb73171561118e4bdd363b8a

5 years agoMerge "Fixed the IllegalStateException on removing account" into qt-dev
TreeHugger Robot [Wed, 26 Jun 2019 11:15:35 +0000 (11:15 +0000)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev

5 years agoMerge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
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: I0edcbba1f4c19052daeb2e69c2dc36e839641d9f

5 years agoMerge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
TreeHugger Robot [Wed, 26 Jun 2019 05:35:29 +0000 (05:35 +0000)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev

5 years agoAdd UI for mainline modules licenses.
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

5 years agoCheck isWfcProvisionedOnDevice in WifiCallingSettings
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

5 years agoMerge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
Antony Sargent [Tue, 25 Jun 2019 18:40:48 +0000 (11:40 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
am: 87fadeeb4a

Change-Id: I59e0e265a5e91bed12d7e786d4fdd3043c068fed

5 years agoMerge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
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

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
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: Ibef4696cf7a55802d4a3edf66d0fb222b9089c1a

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Tue, 25 Jun 2019 14:46:00 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoImport translations. DO NOT MERGE
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

5 years agoMerge "Adds metrics categories for gesture navigation dialogs" into qt-dev
Mehdi Alizadeh [Tue, 25 Jun 2019 00:36:26 +0000 (17:36 -0700)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
am: 32d16291de

Change-Id: I96cbfd9d4e7b3b96f6977958861ae913dfa5e8ec

5 years agoMerge "Adds metrics categories for gesture navigation dialogs" into qt-dev
Mehdi Alizadeh [Tue, 25 Jun 2019 00:09:06 +0000 (00:09 +0000)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev

5 years agoMerge "Revert "Add special apps access settings page for financial app."" into qt-dev
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: I8ab0452cd656d25afe164dec49553512decfdcec

5 years agoMerge "Revert "Add special apps access settings page for financial app."" into qt-dev
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

5 years agoRevert "Add special apps access settings page for financial app."
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

5 years agoAdds metrics categories for gesture navigation dialogs
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

5 years agoMerge "Fix Dark theme case" into qt-dev
Fabian Kozynski [Mon, 24 Jun 2019 19:49:38 +0000 (12:49 -0700)]
Merge "Fix Dark theme case" into qt-dev
am: 5bfb9f3240

Change-Id: I3970a16198bb1d023fdd62840e7078883d4726c5

5 years agoMerge "Fix Dark theme case" into qt-dev
Fabian Kozynski [Mon, 24 Jun 2019 19:03:16 +0000 (19:03 +0000)]
Merge "Fix Dark theme case" into qt-dev

5 years agoAdd a listener for subscription changes to SimDialogFragment
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)

5 years agoFix Dark theme case
Fabian Kozynski [Mon, 24 Jun 2019 14:07:17 +0000 (10:07 -0400)]
Fix Dark theme case

Test: manual
Fixes: 135711083
Change-Id: I91941466b98bbb08d17897784d90a4f467b4de5f

5 years agoRemove dead code
Julia Reynolds [Fri, 21 Jun 2019 17:15:12 +0000 (10:15 -0700)]
Remove dead code
am: ab63fd3c25

Change-Id: Ie0ff97b0db868f4f5aff19c4d8da2a8fc2a5717d

5 years agoRemove dead code
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

5 years agoFix Settings crash when trying to show work policy info
Ivan Podogov [Thu, 20 Jun 2019 22:34:39 +0000 (15:34 -0700)]
Fix Settings crash when trying to show work policy info
am: 242ff568d1

Change-Id: I2a048e75934dda54d4b495908f07016e9c00b674

5 years agoFix Settings crash when trying to show work policy info
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

5 years agoMerge "Cannot switch between multiple TTS engines" into qt-dev
Raff Tsai [Thu, 20 Jun 2019 05:57:25 +0000 (22:57 -0700)]
Merge "Cannot switch between multiple TTS engines" into qt-dev
am: 753215fff9

Change-Id: I5d399c7f653caf53041f1136948f4a8de457d7c5

5 years agoMerge "Cannot switch between multiple TTS engines" into qt-dev
TreeHugger Robot [Thu, 20 Jun 2019 04:42:23 +0000 (04:42 +0000)]
Merge "Cannot switch between multiple TTS engines" into qt-dev

5 years agoMerge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail"...
Arc Wang [Thu, 20 Jun 2019 02:38:57 +0000 (19:38 -0700)]
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev
am: d64b6c8846

Change-Id: Icfa3b21e383182a127a1e633a671013c371ab105

5 years agoMerge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail"...
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

5 years agoMerge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
Arc Wang [Wed, 19 Jun 2019 17:14:55 +0000 (10:14 -0700)]
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
am: d8916ef151

Change-Id: I360ff827ae8544d76c4411410172ace81bbcef56

5 years agoMerge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
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

5 years agoCannot switch between multiple TTS engines
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

5 years agoMerge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
Malcolm Chen [Wed, 19 Jun 2019 03:29:39 +0000 (20:29 -0700)]
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
am: 0304f4d1ce

Change-Id: I3a78fe154d3861c779365d1e611ac8c559861a10

5 years agoMerge "MobileData slice should be null if not-actionable" into qt-dev
Matthew Fritze [Wed, 19 Jun 2019 03:23:30 +0000 (20:23 -0700)]
Merge "MobileData slice should be null if not-actionable" into qt-dev
am: e2ab7540a3

Change-Id: If562aec8635ab4d56ff5016eea5d19d2a96e2383

5 years agoMerge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
TreeHugger Robot [Wed, 19 Jun 2019 03:11:25 +0000 (03:11 +0000)]
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev

5 years agoMerge "MobileData slice should be null if not-actionable" 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

5 years ago[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail
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

5 years agoReplace isSubscriptionEnabled with isActiveSubId.
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

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Tue, 18 Jun 2019 23:23:58 +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: I78d7bd69fee301b4a699557b8f14a220f0c69f8b

5 years agoMerge "Use displayName instead of operator name in MMS data notification" into qt-dev
Antony Sargent [Tue, 18 Jun 2019 23:02:39 +0000 (16:02 -0700)]
Merge "Use displayName instead of operator name in MMS data notification" into qt-dev
am: 40e9ffc2f0

Change-Id: Ie50c5041ef4b9df9ef015cd5f147b1c45956893f

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Tue, 18 Jun 2019 22:55:52 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoImport translations. DO NOT MERGE
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

5 years agoMerge "Use displayName instead of operator name in MMS data notification" into qt-dev
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

5 years agoUse displayName instead of operator name in MMS data notification
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

5 years agoMobileData slice should be null if not-actionable
Matthew Fritze [Wed, 12 Jun 2019 22:00:55 +0000 (15:00 -0700)]
MobileData slice should be null if not-actionable

In cases where MobileData should not be changed:
- Airplane mode
- No data subscriptions

we will return a null slice, rather than a slice with a no-op intent
attached as a primary action. The problem with the no-op intent is that
Slices assumes all actions are by definition, actionable, and the the
TalkBack description announces that the item is clickable, which it
really isn't.

We will in the future investigate disabled actions on Slices, but this
is the short-term fix.

Fixes: 132924748
Test: Robolectric
Test: Panel tester app
Change-Id: I1d62af32fe2dd985f0b52ea4188651e76f9c90ec

5 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Tue, 18 Jun 2019 14:47:28 +0000 (07:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 23e86df342 -s ours
am skip reason: subject contains skip directive

Change-Id: I849487ffafff0f0585ca6a8cf47c912870bbbca0

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 18 Jun 2019 13:25:01 +0000 (06:25 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iac730b3d5c81a72cd072a25c203e67035fae3cf6

5 years agoMerge "Add string for module license." into qt-dev
Andrew Sapperstein [Tue, 18 Jun 2019 02:45:26 +0000 (19:45 -0700)]
Merge "Add string for module license." into qt-dev
am: 05ee8ba830

Change-Id: I186442a7015dc0fa60a9eadbb9a40b8c4dfdfb83

5 years agoMerge "Add string for module license." into qt-dev
TreeHugger Robot [Tue, 18 Jun 2019 02:27:09 +0000 (02:27 +0000)]
Merge "Add string for module license." into qt-dev

5 years agoMerge "If cannot add restricted profile, don't suggest it" into qt-dev
Bookatz [Tue, 18 Jun 2019 01:43:04 +0000 (18:43 -0700)]
Merge "If cannot add restricted profile, don't suggest it" into qt-dev
am: a5018be48a

Change-Id: Ic94e5f918a0db96dd21d8f719231bb65f31bd613

5 years agoMerge "If cannot add restricted profile, don't suggest it" into qt-dev
TreeHugger Robot [Tue, 18 Jun 2019 00:47:16 +0000 (00:47 +0000)]
Merge "If cannot add restricted profile, don't suggest it" into qt-dev

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Mon, 17 Jun 2019 23:46:18 +0000 (16:46 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 99808b4824 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib835b3160d2394d5e1f177f16065b653804d62bd

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Mon, 17 Jun 2019 23:35:01 +0000 (23:35 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoMerge "Get rid of "Assistant" from apps summary" into qt-dev
tmfang [Mon, 17 Jun 2019 23:34:20 +0000 (16:34 -0700)]
Merge "Get rid of "Assistant" from apps summary" into qt-dev
am: a0ed4291dc

Change-Id: I35bbd8e9f3000160c077f630511993198ab4b321

5 years agoAdd string for module license.
Andrew Sapperstein [Mon, 17 Jun 2019 23:28:21 +0000 (16:28 -0700)]
Add string for module license.

Bug: 135183006
Test: is string addition
Change-Id: I6764331d4ef33242b0bef913f32a62799df173c3

5 years agoMerge "Get rid of "Assistant" from apps summary" into qt-dev
TreeHugger Robot [Mon, 17 Jun 2019 23:05:51 +0000 (23:05 +0000)]
Merge "Get rid of "Assistant" from apps summary" into qt-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 17 Jun 2019 22:13:49 +0000 (15:13 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 135215049
Change-Id: I48aaceea6d191bf7af302ad0365505fe96c2e186

5 years agoIf cannot add restricted profile, don't suggest it
Bookatz [Mon, 17 Jun 2019 17:55:02 +0000 (10:55 -0700)]
If cannot add restricted profile, don't suggest it

Previously, on devices that cannot add a restricted profile (e.g. most
phones), the Multiple users menu had an option to "Add user", whereas
for devices that can, the option read "Add user or profile". Now it only
says the latter, due to ag/6412347. We add back the original wording
here.

Fixes: 135294519
Test: manual confirmation on a phone that text says "Add user"
Test: m -j ROBOTEST_FILTER=UserSettingsTest RunSettingsRoboTests
Change-Id: Ia166b6ff9c69c0042e8a781be1146a5622177121

5 years agoMerge "Add "Your work policy info" entry in Privacy settings" into qt-dev
Ivan Podogov [Mon, 17 Jun 2019 12:49:13 +0000 (05:49 -0700)]
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev
am: 9a1c75c57a

Change-Id: Idf96f32733b5a3aedab325cbeba4b67c1d20ce24

5 years agoMerge "Add "Your work policy info" entry in Privacy settings" into qt-dev
Ivan Podogov [Mon, 17 Jun 2019 12:39:10 +0000 (12:39 +0000)]
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev

5 years agoFixed the IllegalStateException on removing account
Sunny Shao [Thu, 30 May 2019 03:22:39 +0000 (11:22 +0800)]
Fixed the IllegalStateException on removing account

We display a dialog in AccountManager.removeAccountAsUser() callback, but at that
time fragment is onstop() which causes the IllegalStateException.

Fixes: 133253227
Fixes: 135004255
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard

Change-Id: I8534e8f7118234f6346607415698f9f91c3e5ffb
(cherry picked from commit d843ee85de0e07a186fbba758d1069d2ca598a76)

5 years agoGet rid of "Assistant" from apps summary
tmfang [Mon, 10 Jun 2019 10:54:15 +0000 (18:54 +0800)]
Get rid of "Assistant" from apps summary

Since "Notification Assistant" is no longer in Q,
we should remove the relevant name in summary.

Test: Rebuild
Fixes: 134180282
Change-Id: I0f41955769ec020d2dd7fbbc8424c95f1b5a32d9

5 years agoShow a dialog with a slider to set the back gesture's sensitivity
Mehdi Alizadeh [Sat, 15 Jun 2019 00:11:54 +0000 (17:11 -0700)]
Show a dialog with a slider to set the back gesture's sensitivity
am: 7d43125964

Change-Id: I64cf3b8725efb8f8377e4f9dac545743066b2cbb

5 years agoShow a dialog with a slider to set the back gesture's sensitivity
Mehdi Alizadeh [Wed, 22 May 2019 18:22:45 +0000 (11:22 -0700)]
Show a dialog with a slider to set the back gesture's sensitivity

Bug: 131447780
Test: Manual test on device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest

Change-Id: I9fcd1a50c77689118857326de0cf8082e835b491

5 years agoMerge "Handle null intent in WifiCallingPreferenceController" into qt-dev
Lei Yu [Fri, 14 Jun 2019 22:56:10 +0000 (15:56 -0700)]
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
am: b4d94a8ccc

Change-Id: I82623904692cd6f9cdf1daf50b366c8a41f15804

5 years agoMerge "Handle null intent in WifiCallingPreferenceController" into qt-dev
Lei Yu [Fri, 14 Jun 2019 22:38:59 +0000 (22:38 +0000)]
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev

5 years agoAdd "Your work policy info" entry in Privacy settings
Ivan Podogov [Fri, 17 May 2019 14:20:25 +0000 (15:20 +0100)]
Add "Your work policy info" entry in Privacy settings

Bug: 132904820
Test: manual
Change-Id: Id706d450c3ad6a6a8c1e402d39d18e048cdb6519

5 years agoMerge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
Yiwei Zhang [Thu, 13 Jun 2019 23:50:38 +0000 (16:50 -0700)]
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
am: 4af74dd86d

Change-Id: I02f895a2c7b5a66dc71db0a60356d854c9123a82

5 years agoMerge "Fix Calls/SMS default SIM selector" into qt-dev
Antony Sargent [Thu, 13 Jun 2019 23:49:16 +0000 (16:49 -0700)]
Merge "Fix Calls/SMS default SIM selector" into qt-dev
am: 7af299c604

Change-Id: I588c6858b67101e03efff9235e96d799237135fe

5 years agoMerge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
TreeHugger Robot [Thu, 13 Jun 2019 23:44:36 +0000 (23:44 +0000)]
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev

5 years agoMerge "Fix Calls/SMS default SIM selector" into qt-dev
TreeHugger Robot [Thu, 13 Jun 2019 23:25:04 +0000 (23:25 +0000)]
Merge "Fix Calls/SMS default SIM selector" into qt-dev

5 years agoFix Calls/SMS default SIM selector
Antony Sargent [Wed, 12 Jun 2019 22:33:33 +0000 (15:33 -0700)]
Fix Calls/SMS default SIM selector

In cases where a SIM is initially disabled, even after you turn it on
the ListPreference's for selecting the default SIM for Calls and SMS
weren't working because the preference change listener wasn't getting
registered. This CL fixes that for these controllers by always
registering a change listener whenever we make the preference visible.

Fixes: 134472294
Bug: 135142209
Test: make RunSettingsRoboTests
Change-Id: Ia9362b7f26309bdbd6c5e8140fb606b28e2b34d8

5 years agoHandle null intent in WifiCallingPreferenceController
Lei Yu [Thu, 13 Jun 2019 21:07:57 +0000 (14:07 -0700)]
Handle null intent in WifiCallingPreferenceController

When intent is null, we will hide wifi calling preference however
its listener might still triggered with null intent.

This CL update controller so it can handle this event inside listener
callback.

Fixes: 135095929
Test: RunSettingsRoboTests
Change-Id: I4c5aba03871f11a2d9f9b4da329c2c2655ff9adb

5 years ago[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am...
Brad Ebinger [Thu, 13 Jun 2019 20:52:20 +0000 (13:52 -0700)]
[automerger skipped] Merge "Allow SimDialogActivity to be started for result" am: 11d92e894a
am: 33b1bfb8fb -s ours
am skip reason: change_id Ib448a6901581294050fc988ed9c16f7e93066860 with SHA1 9761dd4634 is in history

Change-Id: I1486dd381d91fcbc415c03b616d716165325a689

5 years agoMerge "Allow SimDialogActivity to be started for result"
Brad Ebinger [Thu, 13 Jun 2019 20:42:41 +0000 (13:42 -0700)]
Merge "Allow SimDialogActivity to be started for result"
am: 11d92e894a

Change-Id: I016022dbc01916c32511244c1031f9a15359ecf5

5 years agoMerge "Allow SimDialogActivity to be started for result"
Brad Ebinger [Thu, 13 Jun 2019 20:17:19 +0000 (20:17 +0000)]
Merge "Allow SimDialogActivity to be started for result"

5 years agoGame Driver: Allow user to apply prerelease driver for all apps
Yiwei Zhang [Tue, 11 Jun 2019 02:06:51 +0000 (19:06 -0700)]
Game Driver: Allow user to apply prerelease driver for all apps

Currently the global opt-in is only available to Game Driver. This change has
added an option to let developers to opt-in all apps to use prerelease driver.
GameDriverEnableForAllAppsPreferenceController is then refactored from
SwitchPreference to ListPreference to support this change.

Bug: 134881329
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GameDriver
Change-Id: I6dcb3a22a4033a576605d42aa80b09db088d4aa2

5 years agoRefresh the whole rule in zen listing screen
Julia Reynolds [Thu, 13 Jun 2019 18:25:22 +0000 (11:25 -0700)]
Refresh the whole rule in zen listing screen
am: 78ef02eb8f

Change-Id: I701a3678ab547584360c42e4f7b53755ba4059d6

5 years agoRefresh the whole rule in zen listing screen
Julia Reynolds [Thu, 13 Jun 2019 16:29:15 +0000 (12:29 -0400)]
Refresh the whole rule in zen listing screen

Because the whole rule is pushed to NMS when it's
enabled/disabled.

Test: manual
Fixes: 135170330
Change-Id: I4bbc30f82dab07cff9184f9ab8a6f729499c6126

5 years agoMerge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
Yiwei Zhang [Thu, 13 Jun 2019 15:46:47 +0000 (08:46 -0700)]
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
am: 0de0d5be39

Change-Id: Ib806945a955125febf2d7eb8c37e735c9e2ade0d

5 years agoMerge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
TreeHugger Robot [Thu, 13 Jun 2019 15:38:54 +0000 (15:38 +0000)]
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev

5 years agoMerge "Fix typo for Accessibility permission dialog" into qt-dev
Kevin Yao [Thu, 13 Jun 2019 04:47:04 +0000 (21:47 -0700)]
Merge "Fix typo for Accessibility permission dialog" into qt-dev
am: e78e4dc6f2

Change-Id: Ia3292d11926a24e9e907c71b5d85bf97a062a066

5 years agoMerge "Fix typo for Accessibility permission dialog" into qt-dev
TreeHugger Robot [Thu, 13 Jun 2019 04:30:26 +0000 (04:30 +0000)]
Merge "Fix typo for Accessibility permission dialog" into qt-dev

5 years agoGame Driver: Add UI support for prerelease Game Driver
Yiwei Zhang [Mon, 10 Jun 2019 07:57:03 +0000 (00:57 -0700)]
Game Driver: Add UI support for prerelease Game Driver

Bug: 134881329
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GameDriver
Change-Id: I9c710a5e6adff9b01c656d576f53f9b4b3360207

5 years agoMerge "Remove developer option to disable device ID access restrictions" into qt-dev
Michael Groover [Wed, 12 Jun 2019 21:17:03 +0000 (14:17 -0700)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
am: ad85d6b942

Change-Id: I8884f4b01a3980bfc00e9a57ea1b8c43c27578d3

5 years agoMerge "Remove developer option to disable device ID access restrictions" into qt-dev
Michael Groover [Wed, 12 Jun 2019 20:31:16 +0000 (20:31 +0000)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev

5 years agoMerge "Update mainline module versions string." into qt-dev
Fan Zhang [Tue, 11 Jun 2019 21:38:42 +0000 (14:38 -0700)]
Merge "Update mainline module versions string." into qt-dev
am: 2aa94b97c7

Change-Id: I0004f9860c2c8f16be3612c165b3e2a40031819c

5 years agoMerge "Update mainline module versions string." into qt-dev
TreeHugger Robot [Tue, 11 Jun 2019 21:20:12 +0000 (21:20 +0000)]
Merge "Update mainline module versions string." into qt-dev

5 years agoMerge "Remove on/off toggle for physical SIMs" into qt-dev
Antony Sargent [Tue, 11 Jun 2019 20:13:52 +0000 (13:13 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev
am: 5836158f2e

Change-Id: Idfe1855b09448feea3036185f092b3f56b10f18e

5 years agoMerge "Remove on/off toggle for physical SIMs" into qt-dev
TreeHugger Robot [Tue, 11 Jun 2019 20:06:54 +0000 (20:06 +0000)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev

5 years agoFix overlapping problem on notification screen
tmfang [Tue, 11 Jun 2019 17:45:44 +0000 (10:45 -0700)]
Fix overlapping problem on notification screen
am: 564fcb90ab

Change-Id: I22700badde84ab5a723b41d59fbd72a9f751452e

5 years ago[Wi-Fi DPP] Support WPA2/WPA3 transition mode
Arc Wang [Tue, 11 Jun 2019 03:40:59 +0000 (11:40 +0800)]
[Wi-Fi DPP] Support WPA2/WPA3 transition mode

This change shows buttons of QR code scnanner and QR code generator
for a connected Wi-Fi network.

Bug: 134706055
Test: Generate QR code for a WPA2/WPA3 personal transition mode Wi-Fi AP
          and check if the security type is WPA2 personal.
      Generate QR code for open network.
      Generate QR code for OWE network.
      Scan a QR code of open network, verify connection.
      Scan a QR code of OWE network, verify connection.
      Scan a QR code of WPA3 network, verify connection.
      Scan a QR code of WPA3 network, verify transition mode connection.

Change-Id: I60f2c38585f85745f992fa63a5ea85312f08c5e5

5 years agoFix overlapping problem on notification screen
tmfang [Tue, 11 Jun 2019 05:56:56 +0000 (13:56 +0800)]
Fix overlapping problem on notification screen

If we didn't set view and lifecycle for EntityHeaderController,
it only sets "z-order" as 0 for action bar.

So, user sees overlapped problem while user is scrolling view.

For now, we set view and lifecycle as parameter for EntityHeaderController,
then EntityHeaderController can change "z-order" while scrolling view.

Test: visual, robotest
Fixes: 132819126
Change-Id: Ieb01b26e4d6ca4d82f72371620938665de8149a0

5 years agoUpdate mainline module versions string.
Fan Zhang [Mon, 10 Jun 2019 21:40:32 +0000 (14:40 -0700)]
Update mainline module versions string.

We are putting this particular Google string into AOSP because:
1. This feature is part of platform mainline and has a hard dependency
   to Google Play.
2. Settings code has no way to target gms devices, or mainline devices.
   It's either AOSP or OEM. And this change is beyond OEM.

Fixes: 134101529
Test: manual
Change-Id: Ic4e7a7539230db0390bb9230931132e5500a1eb4

5 years agoRemove on/off toggle for physical SIMs
Antony Sargent [Mon, 10 Jun 2019 21:41:08 +0000 (14:41 -0700)]
Remove on/off toggle for physical SIMs

Our original design for mobile network subscription management included
having an on/off toggle for both eSIMs and physical SIMs. However, it
turns out that our current telephony stack has some problems with
disabling physical SIMs, so for now we're removing the on/off
toggle. Because of this, we've added a footer to the SIM details page
for physical SIMS letting users know that to disable them you need to
remove them from the device.

Even though we're removing the on/off toggle for pSIMs, there are still
a few edge cases where you could end up with a disabled one (eg having
two SIMs in single-SIM mode where the eSIM is active and then you erased
the eSIM). In order to have a way to re-enable the pSIM in these cases,
this CL changes the relevant pref's summary to "Tap to activate <name>"
and makes the tap action begin the re-enabling. This can affect either
the Mobile network pref on the Network & internet main page (if this
disabled pSIM is the only SIM), or an entry in the Mobile networks list
page (if there are still multiple SIMs present).

Finally, this also fixes a problem where we weren't showing the on/off
toggle for eSIMs if you only had one SIM total; we actually always want
to show it for eSIMs.

Bug: 132921553
Test: make RunSettingsRoboTests
Change-Id: Id0750ebd5bed46dc2450b65b53cc81847ef09b82