OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoMerge "Fix Dark theme case" into qt-dev am: 5bfb9f3240
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

5 years agoMerge "Fix Dark theme case" into qt-dev
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

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 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 agoMerge "Refresh camera permission status when it changed." into qt-r1-dev
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

5 years agoMerge "Refresh camera permission status when it changed." into qt-r1-dev
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

5 years agoRefresh camera permission status when it changed.
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

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

Change-Id: I26d668f809712749249ab0e8f8fda8566929e17b

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: I8d629b89f8b8145e8381301d888aeb8b050123c8

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 am: 242ff568d1
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

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

5 years agoMerge "Update System->Gesture icon" into qt-r1-dev
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

5 years agoMerge "Update System->Gesture icon" into qt-r1-dev
TreeHugger Robot [Thu, 20 Jun 2019 17:43:08 +0000 (17:43 +0000)]
Merge "Update System->Gesture icon" into qt-r1-dev

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 am: 753215fff9
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

5 years agoMerge "Cannot switch between multiple TTS engines" into qt-dev
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

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 agoUpdate System->Gesture icon
Edgar Wang [Thu, 20 Jun 2019 04:10:30 +0000 (12:10 +0800)]
Update System->Gesture icon

Fixes: 135137464
Test: manual
Change-Id: I3de871882d74c2d6f4c5b1ce8e7ee65de9276a0c

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

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: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

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

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 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

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

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

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 "Lockscreen bypass should be searchable" into qt-r1-dev
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

5 years agoMerge "Lockscreen bypass should be searchable" into qt-r1-dev
TreeHugger Robot [Wed, 19 Jun 2019 05:05:43 +0000 (05:05 +0000)]
Merge "Lockscreen bypass should be searchable" into qt-r1-dev

5 years agoMerge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev am: 0304f4d1ce
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

5 years agoMerge "MobileData slice should be null if not-actionable" into qt-dev am: e2ab7540a3
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

5 years agoMerge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
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

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

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

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 agoLockscreen bypass should be searchable
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

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

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 am: d1defa...
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

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

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

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

5 years agoMerge "Retrieve help URL" into qt-r1-dev
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

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 agoImport translations. DO NOT MERGE
Bill Yi [Tue, 18 Jun 2019 21:38:46 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8bd2c1b220673e5f2d54e7d866d329791dcc9c41

5 years agoMerge "Retrieve help URL" into qt-r1-dev
TreeHugger Robot [Tue, 18 Jun 2019 21:03:54 +0000 (21:03 +0000)]
Merge "Retrieve help URL" into qt-r1-dev

5 years agoRetrieve help URL
Kevin Chyn [Tue, 18 Jun 2019 18:13:31 +0000 (11:13 -0700)]
Retrieve help URL

Fixes: 118644802

Test: Help page is seen
Change-Id: Ib89d21ce5027f9ca9c3b6709a9a1301f988a0675

5 years ago[automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours
Bill Yi [Tue, 18 Jun 2019 15:03:29 +0000 (08:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours
am: 6fd15de6f6 -s ours
am skip reason: subject contains skip directive

Change-Id: I7a78c1443618bdd532ce2b286279a36ebd558fe0

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

Change-Id: I30e310a0e002907d0c0feff041d803dfe7705a54

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 am: 05ee8ba830
Andrew Sapperstein [Tue, 18 Jun 2019 03:02:21 +0000 (20:02 -0700)]
Merge "Add string for module license." into qt-dev am: 05ee8ba830
am: e6f8d61135

Change-Id: Ided87f7c33a2feaf2491bb5890dfbc186261cb93

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

Change-Id: I92e73c1774cc32bfc9cfbb3f6ce9470e9410871a

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 am: a5018be48a
Bookatz [Tue, 18 Jun 2019 01:51:24 +0000 (18:51 -0700)]
Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a
am: 58f6926882

Change-Id: I298bb3163e8a796cffbe3e9d7ddc1d9bf47cfefc

5 years agoMerge "Do not allow toggle to be clickable/focusable" into qt-r1-dev
Kevin Chyn [Tue, 18 Jun 2019 01:51:02 +0000 (18:51 -0700)]
Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev
am: 5ac3690908

Change-Id: Iedc0340b18af5b52f5f60b03b3333b4ee1b1dce1

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

Change-Id: I76b1faf3e21f5b552ef3ad80660dee0786234d15

5 years agoMerge "Do not allow toggle to be clickable/focusable" into qt-r1-dev
Kevin Chyn [Tue, 18 Jun 2019 01:40:35 +0000 (01:40 +0000)]
Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev

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 am: 99808b...
Bill Yi [Mon, 17 Jun 2019 23:54:17 +0000 (16:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours
am: 8ca571f9be -s ours
am skip reason: subject contains skip directive

Change-Id: I8288aaad5df249aabf288870ffa02df611a6976c

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Mon, 17 Jun 2019 23:44:18 +0000 (16:44 -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: Icfdb259298fe0246039daa2a518fc9a9492c92ab

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

Change-Id: I4bbbeac964821e10110c9e55c3b1d766433456ca

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

Change-Id: Ia0f9ef06ff90d8b355cceeb6302763119d8d29f0

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 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 agoDo not allow toggle to be clickable/focusable
Kevin Chyn [Mon, 17 Jun 2019 20:08:23 +0000 (13:08 -0700)]
Do not allow toggle to be clickable/focusable

The entire preference is already clickable/focusable. Also, changed it so that
the entire preferenceview is clickable/focusable in non-accessibility mode as well
to better match Settings UX.

Also, no need to setClickable, since it is already by default

Fixes: 130398575

Test: With and without accessibility turned on, toggle works
Test: With accessibility turned on, toggle no longer takes a separate
      focus in addition to the preference

Change-Id: Iaff05cdf350f8d4f4c0f53b539770a7ad1f7d8ad

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 am: 9a1c75c57a
Ivan Podogov [Mon, 17 Jun 2019 12:56:09 +0000 (05:56 -0700)]
Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a
am: 8573d27d31

Change-Id: I9346a8f41cddf7a17e7ad1f7ed12d239740330c1

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: Ib61dae6c30e90500aaec381a6eb5f7f7a82bc610

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 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 agoMerge "Update string for work profile face unlock" into qt-r1-dev
Kevin Chyn [Sat, 15 Jun 2019 01:21:18 +0000 (18:21 -0700)]
Merge "Update string for work profile face unlock" into qt-r1-dev
am: 5d8cd009fa

Change-Id: If58e69c87fafb39dbf6fd6e6abfb1abb8bcead20

5 years agoMerge "Update string for work profile face unlock" into qt-r1-dev
Kevin Chyn [Sat, 15 Jun 2019 00:49:36 +0000 (00:49 +0000)]
Merge "Update string for work profile face unlock" into qt-r1-dev

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

Change-Id: Id7e7a209d4c9a30bd1691204356c30bfa376e4a0

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

Change-Id: I8db63be340f8cf465599ad76ea52f8b2453de3c0

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 am: b4d94a8ccc
Lei Yu [Fri, 14 Jun 2019 23:13:03 +0000 (16:13 -0700)]
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
am: ab2a2b3d3f

Change-Id: I27e4ddd96d4f4ef4d0545c94aea12c0c442ad10f

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

Change-Id: I025073624de894f70216eb46bb9cd48e8435f9dd

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 agoMerge "Move the permission warning message to corresponding layout file." into qt...
Yi Jiang [Fri, 14 Jun 2019 22:36:10 +0000 (15:36 -0700)]
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev
am: 575bdfcaad

Change-Id: I98f9ff0cfe6cc6880b3b53b79c399dc3e1cf8309

5 years agoMerge "Move the permission warning message to corresponding layout file." into qt...
Yi Jiang [Fri, 14 Jun 2019 22:14:13 +0000 (22:14 +0000)]
Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev

5 years agoUpdate string for work profile face unlock
Kevin Chyn [Fri, 14 Jun 2019 19:56:59 +0000 (12:56 -0700)]
Update string for work profile face unlock

Fixes: 134053456

Test: With work profile and fully managed device, strings are correct
Change-Id: I358b94acfa0626083fdc422b6333765dcc2bc158

5 years agoMove the permission warning message to corresponding layout file.
Yi Jiang [Wed, 12 Jun 2019 02:30:34 +0000 (19:30 -0700)]
Move the permission warning message to corresponding layout file.

Bug: 129284701
Test: Manually verified
Test: atest AdaptiveSleepPermissionPreferenceController

Change-Id: Ic31bdb37f751288ae6dcd1253d56806c767e2e47

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 [Fri, 14 Jun 2019 01:45:40 +0000 (18:45 -0700)]
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev am: 4af74dd86d
am: 8bde8b44f5

Change-Id: I30c5973667f4c74a218fc0eee821dbb9abab026a

5 years agoMerge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
Yiwei Zhang [Fri, 14 Jun 2019 01:16:44 +0000 (18:16 -0700)]
Merge "Game Driver: Allow user to apply prerelease driver for all apps" into qt-dev
am: 4af74dd86d

Change-Id: Ifef443ad30d40b6f5e2f06025da85f9d572d358d

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

Change-Id: I2a025280155f5b78cea3f9328398a3fe8e4e12e2

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

Change-Id: I35b3e57d151b6d20e5b088a7d6269490317644e5

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