OSDN Git Service

android-x86/packages-apps-Settings.git
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 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 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: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
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 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 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
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
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 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
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
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 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

5 years agoMerge "Add tutorial dialog for gesture navigation" into qt-dev
Kevin Chang [Mon, 10 Jun 2019 00:57:14 +0000 (00:57 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev

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

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 8 Jun 2019 19:01:55 +0000 (12:01 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If595c532cf6a8e9724c74c96b29356ab1bdb65b0

5 years agoMerge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
TreeHugger Robot [Sat, 8 Jun 2019 06:41:11 +0000 (06:41 +0000)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev

5 years agoOnly launch fingerprint settings after enrollment if it's from the summary controller
Kevin Chyn [Fri, 7 Jun 2019 22:13:29 +0000 (15:13 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller

Fixes: 133822544

Test: No more multiple instances of fingerprint settings after enrolling
      from within the settings page

Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL does not
      send the user to fingerprint settings after completing enrollment

Change-Id: I003dc142b01ed6ffae83299ab4b69f4896eb93e3

5 years agoDisconnect if the user cancels the no/partial connectivity dialog
Lorenzo Colitti [Fri, 7 Jun 2019 06:18:21 +0000 (15:18 +0900)]
Disconnect if the user cancels the no/partial connectivity dialog

If the user exits the no Internet or partial connectivity dialog
without taking any action, there is no longer any way to use the
network. So, disconnect the network.

Bug: 130766237
Test: clicking outside dialog disconnects network
Test: orientation changes do not disconnect network
Change-Id: I80c2c98c994dc01e53b32f40332b3f1bd03b6012

5 years agoFix NFC state switched off every time user entered connection preferences page
George Chang [Thu, 30 May 2019 10:23:18 +0000 (18:23 +0800)]
Fix NFC state switched off every time user entered connection preferences page

NfcAirplaneModeObserver added a scenario that
switched NFC off every time  a user entered connection
preferences page if airplane mode was on.
Even when a user manually switched on NFC, the observer would still
turn NFC off when re-entering connection preferences page.

GSAM TS.27 certification requires NFC state to be consistent
under AirplaneMode before and after reboot the device.
NfcAirplaneModeObserver breaks the requirement
because it would always switch NFC off under airplane mode
when a user checked the NFC state in settings page.

Fix it by removing NfcAirplaneModeObserver.
Keep the NFC state consistent.

Bug:128384879
Test: make RunSettingsRoboTests / Check Nfc on/off Status
Merged-In: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
Change-Id: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20

5 years agoMerge "Silent notifs appear on lockscreen by default" into qt-dev
TreeHugger Robot [Thu, 6 Jun 2019 18:36:57 +0000 (18:36 +0000)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev

5 years agoUpdates System Navigation strings
Mehdi Alizadeh [Wed, 5 Jun 2019 22:34:50 +0000 (15:34 -0700)]
Updates System Navigation strings

Bug: 134517326
Test: Verified manually
Change-Id: I777cfdc3a760040fdea745c5247152c5ff0d6218

5 years agoSilent notifs appear on lockscreen by default
Julia Reynolds [Thu, 6 Jun 2019 15:18:24 +0000 (11:18 -0400)]
Silent notifs appear on lockscreen by default

Test: atest
Bug: 134613164
Change-Id: I1ee39a1302010a2a29ba6d0060f19565e41859a2

5 years agoAdd tutorial dialog for gesture navigation
Kevin Chang [Fri, 31 May 2019 07:14:47 +0000 (15:14 +0800)]
Add tutorial dialog for gesture navigation

Add new tutorial dialog for gesture navigation in order to teach
users how to use the gesture

Fixes: 133650388
Test: Manual
Change-Id: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
Merged-In: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd

5 years agoMerge "UE showed wrong title and message when enabling data roaming." into qt-dev
Andy Chou [Thu, 6 Jun 2019 00:35:16 +0000 (00:35 +0000)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev

5 years agoMerge "Strings for pSIM on/off toggle removal" into qt-dev
Antony Sargent [Thu, 6 Jun 2019 00:19:16 +0000 (00:19 +0000)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev

5 years agoMerge "Read the subtext of notif importance field on selection" into qt-dev
TreeHugger Robot [Wed, 5 Jun 2019 21:37:17 +0000 (21:37 +0000)]
Merge "Read the subtext of notif importance field on selection" into qt-dev

5 years agoStrings for pSIM on/off toggle removal
Antony Sargent [Wed, 5 Jun 2019 21:16:48 +0000 (14:16 -0700)]
Strings for pSIM on/off toggle removal

We need to remove the on/off toggle for pSIMs because of unexpected
problems in the telephony stack with being able to disable a pSIM. These
new strings are used in the updated UX we're adding to deal with this.

Bug: 132921553
Test: n/a
Change-Id: I60816289e0ef65bbf882a8dca6f08c46742bb1c9

5 years agoKill uid when REQUEST_INSTALL_PACKAGES is denied
Suprabh Shukla [Fri, 31 May 2019 20:45:59 +0000 (13:45 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied

Process privileges like open fds need to be revoked, when this
permission is denied by the user.

Test: Manually verified by checking logs.
Robotest:
atest SettingsRoboTests:ExternalSourcesDetailsTest

Bug: 133504844
Change-Id: I81da0b3a5d6c54e392828829d1a2c43488439504

5 years agoRead the subtext of notif importance field on selection
Julia Reynolds [Wed, 5 Jun 2019 18:07:50 +0000 (14:07 -0400)]
Read the subtext of notif importance field on selection

When using a11y services

Test: manual with Talkback
Bug: 133649570
Change-Id: Ic68a948ab5d55e68994e6b14456d25d438637886

5 years agoMerge "Triggering notifications when dual CDMA SIM combinations are detected" into...
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 18:03:17 +0000 (18:03 +0000)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev

5 years ago[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev...
Raff Tsai [Wed, 5 Jun 2019 09:30:17 +0000 (02:30 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours
am: 64d4433a90 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I0588eac0a4abcb1003b09e5fab92894a8ddfc8f9

5 years ago[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev...
Raff Tsai [Wed, 5 Jun 2019 09:29:51 +0000 (02:29 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours
am: ba0122401d -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ib7ded3d2c08e14e39922ad0f1dd1fb2dd3e27ab9

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:29:05 +0000 (02:29 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours am: c808f15cbe -s ours am: 0b36c5e9ba -s ours
am: e7c298885b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I4a6b3d7b7aaf30bf3abddf9b276e666462a9d831

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:28:55 +0000 (02:28 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours am: 530fa8b25b -s ours am: 20b5a01f6c -s ours
am: 2d387349db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I27f9a530b3814c723726e43e8902651da3bfa937

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:28:42 +0000 (02:28 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours am: 59348982d3 -s ours am: d20d75c39b -s ours
am: 971190b08a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ic3814c5b17fe748c35e11034d75549104e7de429

5 years ago[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev...
Raff Tsai [Wed, 5 Jun 2019 09:25:23 +0000 (02:25 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours
am: 3e1ae79428 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ia0dc8b4e6b5795fb03c30867d77460389bb49155

5 years ago[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev...
Raff Tsai [Wed, 5 Jun 2019 09:24:54 +0000 (02:24 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours
am: 5a326027db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I923b0a55fd8458fa30295fa1f9ca7a31f13d2734

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:22:55 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours am: c808f15cbe -s ours
am: 0b36c5e9ba -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Id32040250480a5ad2e957eaeb4eea5b4dcc6633b

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:22:46 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours am: 530fa8b25b -s ours
am: 20b5a01f6c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I656e7e0fac7c63c55f82bfc01183e69adfe2164b

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:22:36 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours am: 59348982d3 -s ours
am: d20d75c39b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: If4596f7e943656ccb7bc06121fe77c5d6d76d627

5 years ago[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev...
Raff Tsai [Wed, 5 Jun 2019 09:19:30 +0000 (02:19 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours
am: 14302b3ac6 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ic1ddb22a97d9058d5e40b8fddfb3f6f4ef40e150

5 years ago[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev...
Raff Tsai [Wed, 5 Jun 2019 09:19:03 +0000 (02:19 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours
am: 80fea5de92 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ic06c39295c0b1e82701cf1747606afff1e27fd68

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:17:52 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours
am: c808f15cbe -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ia806284e60b86d6d942de73a98d8ef3b48cd6847

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:17:44 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours
am: 530fa8b25b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Iaa5411ff17dddbda7b6584afff8f0a7527609c23

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:17:35 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours
am: 59348982d3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I50749ba4c4a8478acbd70a729fb6e4f1e722254d

5 years ago[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
Raff Tsai [Wed, 5 Jun 2019 09:13:22 +0000 (02:13 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am: 09e255676b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I9ffa1beaa1f10e45dfb29edd2ea1bfd7b4422407

5 years ago[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
Raff Tsai [Wed, 5 Jun 2019 09:12:49 +0000 (02:12 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am: 8c612b1334 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I252ffcb3e7c5f1be519c9e809d6b43a296bcbe9d

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:12:01 +0000 (02:12 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
am: 65294e6ee5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I02047207e9ed30afb0afb003f0c93f2cfb59addd

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:11:52 +0000 (02:11 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
am: bfe5b37bc8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I68b5c6aebfd69660c51613b6a96ef0c354d800ae

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Raff Tsai [Wed, 5 Jun 2019 09:11:36 +0000 (02:11 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0
am: 6dbb3108a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I171e67f778cd8e8f67cb8d685ecfe09316619cf5

5 years agoMerge changes from topic "security_fix_settings" into oc-dev
TreeHugger Robot [Wed, 5 Jun 2019 09:02:31 +0000 (09:02 +0000)]
Merge changes from topic "security_fix_settings" into oc-dev

* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e
  Do not allow draw on top for App notification settings

5 years agoMerge changes from topic "security_fix_settings" into oc-dev
TreeHugger Robot [Wed, 5 Jun 2019 09:02:31 +0000 (09:02 +0000)]
Merge changes from topic "security_fix_settings" into oc-dev

* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e
  Do not allow draw on top for App notification settings

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:10 +0000 (02:50 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693

Change-Id: I45fe88086caf9220b67162863828d3bf0ea30d7f

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:07 +0000 (02:50 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96

Change-Id: I6f8236a1de4c8edc766ae625fe0010924e4cfba3

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:04 +0000 (02:50 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e

Change-Id: I5ed98836a8659baedf50724ce1f65c76bcace5ef

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Android Build Merger (Role) [Wed, 5 Jun 2019 02:48:34 +0000 (02:48 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0

Change-Id: I0b4d8af9f5306150b58fb5cc8e10ba192458a458

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:14 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09

Change-Id: I8f2da352d0658de16a2b4087067a57fa7cf40ad6

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:12 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631

Change-Id: Ief79f2f50874bbfcd214b1ce3248b10532a24452

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:11 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d

Change-Id: I9f55b76cc7079a2eb682c2093f57ac0c58e524c9

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:09 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8

Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f

5 years ago[automerger skipped] Do not allow draw on top for App notification settings skipped...
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:07 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e

Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02

5 years agoRemove developer option to disable device ID access restrictions
Michael Groover [Wed, 5 Jun 2019 00:32:59 +0000 (17:32 -0700)]
Remove developer option to disable device ID access restrictions

Bug: 123937881
Test: Manually verified developer option is no longer available.
Change-Id: I00e8db23d88a5c84e273dfa4b8f797fa2a995de0

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

5 years agoTriggering notifications when dual CDMA SIM combinations are detected
Malcolm Chen [Fri, 31 May 2019 22:35:08 +0000 (15:35 -0700)]
Triggering notifications when dual CDMA SIM combinations are detected

In Settings, catch the intent from Telephony about SIM combination
warning and show a notification about it.

Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.

Change-Id: Ifd0e13781e4afc3bfd82415b3e51fd10176d9f9d

5 years agoMove vibration preview invokation to the correct place
Alexey Kuzmin [Tue, 4 Jun 2019 14:59:32 +0000 (15:59 +0100)]
Move vibration preview invokation to the correct place

Bug: 133711461
Bug: 130332550
Test: Open Settings > Accessibility > Vibration. Switch between the
vibration settings several times. The preview should be played, and it
should be in line with the selected setting

Change-Id: I65fcd679c4c61afa4cce9cee652987d81572096c

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 4 Jun 2019 15:36:03 +0000 (08:36 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I11c95502fa223dc53994a1dde87cc2400106b815

5 years agoMerge "Cleanup background activity starts for release." into qt-dev
Alan Stokes [Tue, 4 Jun 2019 14:26:29 +0000 (14:26 +0000)]
Merge "Cleanup background activity starts for release." into qt-dev

5 years agoMerge "Update the string of both magnification settings and gesture navigation tutori...
Kevin Chang [Tue, 4 Jun 2019 01:29:21 +0000 (01:29 +0000)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev

5 years agoAdd a "data during calls" preference
Antony Sargent [Mon, 13 May 2019 23:44:13 +0000 (16:44 -0700)]
Add a "data during calls" preference

This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.

Bug: 132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941

5 years agoMerge "Use new API to build NetworkTemplate" into qt-dev
Lei Yu [Mon, 3 Jun 2019 16:54:29 +0000 (16:54 +0000)]
Merge "Use new API to build NetworkTemplate" into qt-dev

5 years agoUpdate the string of both magnification settings and gesture navigation tutorial...
Kevin Chang [Wed, 29 May 2019 10:21:28 +0000 (18:21 +0800)]
Update the string of both magnification settings and gesture navigation tutorial dialog

Referenced link for the details:
https://docs.google.com/document/d/1eB2wukextG5UFECTwde5zcmXXTQCvgnqJJjnd1Chu9Q
https://docs.google.com/document/d/14iwCag7FBD4e9bR03HjbC0D2s_u-Fpr3K8vl_XMjkD0

Bug: 133336814
Bug: 133650388
Test: Visual
Change-Id: I4893183b55f609bfee3d1dfe80aa02cce624e857

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

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Jun 2019 17:06:36 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I861f60fb68f5bb9d20d0c0e7c338144e70c077eb

5 years agoMerge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
Mehdi Alizadeh [Fri, 31 May 2019 21:08:08 +0000 (21:08 +0000)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev

5 years agoDisables the Gesture nav option if 3P launcher is default
Mehdi Alizadeh [Wed, 15 May 2019 18:01:25 +0000 (11:01 -0700)]
Disables the Gesture nav option if 3P launcher is default

Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.

Bug: 129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest

Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637

5 years agoDo not allow draw on top for App notification settings
Raff Tsai [Fri, 8 Mar 2019 08:19:30 +0000 (16:19 +0800)]
Do not allow draw on top for App notification settings

Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f0b8e01e5f595bd60edc594eef58aba)

5 years agoDo not allow draw on top for App notification settings
Raff Tsai [Fri, 8 Mar 2019 08:19:30 +0000 (16:19 +0800)]
Do not allow draw on top for App notification settings

Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f0b8e01e5f595bd60edc594eef58aba)

5 years agoMerge "Update notification settings animation" into qt-dev
Julia Reynolds [Fri, 31 May 2019 17:27:09 +0000 (17:27 +0000)]
Merge "Update notification settings animation" into qt-dev

5 years agoUse new API to build NetworkTemplate
Lei Yu [Tue, 28 May 2019 17:05:44 +0000 (10:05 -0700)]
Use new API to build NetworkTemplate

This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.

Bug: 133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5

5 years agoMerge "Fix issues in battery usage accounting" into qt-dev
Lei Yu [Fri, 31 May 2019 17:17:51 +0000 (17:17 +0000)]
Merge "Fix issues in battery usage accounting" into qt-dev

5 years agoMerge "Change switch text color to black in dark mode" into qt-dev
TreeHugger Robot [Fri, 31 May 2019 15:59:42 +0000 (15:59 +0000)]
Merge "Change switch text color to black in dark mode" into qt-dev

5 years agoMerge "Reorder notification settings" into qt-dev
TreeHugger Robot [Fri, 31 May 2019 13:24:17 +0000 (13:24 +0000)]
Merge "Reorder notification settings" into qt-dev

5 years agoUpdate notification settings animation
Julia Reynolds [Fri, 31 May 2019 13:18:42 +0000 (09:18 -0400)]
Update notification settings animation

Test: manual
Fixes: 133874971
Change-Id: I8dc399f9de578197322cadbb7cc2c5f75902461d

5 years agoFix typo for Accessibility permission dialog
Kevin Yao [Fri, 31 May 2019 13:08:37 +0000 (21:08 +0800)]
Fix typo for Accessibility permission dialog

Bug: 133362697
Test: Visual
Change-Id: I9dfe9218c1b41cf02257bbfdbe3128f952a9a97c

5 years agoMerge "Remove Permissions Hub." into qt-dev
TreeHugger Robot [Fri, 31 May 2019 13:02:12 +0000 (13:02 +0000)]
Merge "Remove Permissions Hub." into qt-dev

5 years agoUE showed wrong title and message when enabling data roaming.
zoey chen [Fri, 31 May 2019 03:02:25 +0000 (11:02 +0800)]
UE showed wrong title and message when enabling data roaming.

It set wrong string when building the roaming dialog.

BUG: 133731388
Test: Manual test
Change-Id: Ib46b2b2ba1d62f84da7cd82bbbc03fe4f3069afc

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Fri, 31 May 2019 00:30:42 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 May 2019 22:17:06 +0000 (15:17 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6da271a883e0a62cc5f32890c3411e64ef856fa7

5 years agoMerge "Increase char limit to 60 for string translation" into qt-dev
TreeHugger Robot [Thu, 30 May 2019 22:04:47 +0000 (22:04 +0000)]
Merge "Increase char limit to 60 for string translation" into qt-dev

5 years agoChange switch text color to black in dark mode
Salvador Martinez [Thu, 30 May 2019 21:16:52 +0000 (14:16 -0700)]
Change switch text color to black in dark mode

It seems that the attribute values that are used to text color
in the switch bar are selectors which leads to problems because
they include an alpha value when the switch is "off". This would
cause the contrast between the text and the background to be too
low for GAR. This CL simply makes it so that in dark mode the text
for the switch bar is just true black since adjusting the
attributes would have wide scale implications for all UIs using
device default themes.

Test: visual inspection
Bug: 132755745
Change-Id: I309db82e9bf020fb654e0b93f6ec84380ae092f7

5 years agoReorder notification settings
Julia Reynolds [Thu, 30 May 2019 20:52:08 +0000 (16:52 -0400)]
Reorder notification settings

Test: manual
Fixes: 132271798
Change-Id: I57e726a332513620bea25b97345b1a8564c6d5ef

5 years agoMerge "Change notification alert icon" into qt-dev
TreeHugger Robot [Thu, 30 May 2019 20:51:49 +0000 (20:51 +0000)]
Merge "Change notification alert icon" into qt-dev