OSDN Git Service
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
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
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
TreeHugger Robot [Mon, 17 Jun 2019 23:35:01 +0000 (23:35 +0000)]
Merge "Import translations. DO NOT MERGE" 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
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
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
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
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
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
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
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
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
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
Lei Yu [Fri, 14 Jun 2019 22:38:59 +0000 (22:38 +0000)]
Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 13 Jun 2019 23:25:04 +0000 (23:25 +0000)]
Merge "Fix Calls/SMS default SIM selector" into qt-dev
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
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
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
Julia Reynolds [Thu, 13 Jun 2019 18:25:21 +0000 (11:25 -0700)]
Refresh the whole rule in zen listing screen
am:
78ef02eb8f
Change-Id: I60352b05ca01838882b31f0106108c5392bc3c50
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
Yiwei Zhang [Thu, 13 Jun 2019 15:45:42 +0000 (08:45 -0700)]
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
am:
0de0d5be39
Change-Id: I16a67e516ff20ec1aa38aa83d11c433e82299597
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
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: I154f5f038a2944f9c1376b4baba8a4cd85b49adb
TreeHugger Robot [Thu, 13 Jun 2019 04:30:26 +0000 (04:30 +0000)]
Merge "Fix typo for Accessibility permission dialog" into qt-dev
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
Kevin Chyn [Wed, 12 Jun 2019 21:51:42 +0000 (21:51 +0000)]
Merge changes from topic "face-bypass-move" into qt-r1-dev
* changes:
Make bypass controller consistent with rest of face unlock settings
Move lockscreen bypass setting to Settings > Security > Face unlock
Michael Groover [Wed, 12 Jun 2019 21:20:33 +0000 (14:20 -0700)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
am:
ad85d6b942
Change-Id: Ie49e2845fe5c3389b9a44803e293789971ecb485
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
Kevin Chyn [Wed, 12 Jun 2019 19:13:06 +0000 (12:13 -0700)]
Make bypass controller consistent with rest of face unlock settings
1) Should only be shown for owner profile
2) Should be disabled if A) not enrolled, B) DevicePolicyManager, C) HAL issue
Fixes:
134700640
Test: Manual test of conditions above
Change-Id: Id72db59c662df6c529c98aafd610de8c86c77ebd
Kevin Chyn [Wed, 12 Jun 2019 18:55:22 +0000 (11:55 -0700)]
Move lockscreen bypass setting to Settings > Security > Face unlock
Fixes:
134700640
Test: atest FaceSettingsLockscreenBypassPreferenceControllerTest
Test: enabling/disabling setting through Settings > Security > Face unlock
works as expected
Test: preference controller no longer seen in Settings > Display > Lock screen display
Change-Id: I54807ad92fac62398a2b9dab93dd638775a09c8d
Kevin Chyn [Wed, 12 Jun 2019 03:40:30 +0000 (20:40 -0700)]
Call finish() when enrollment loses focus
Bug:
134971919
Test: Entering keyguard on any enrollment screen finishes enrollment now
Test: Going back/forward works
Change-Id: I2c80a5586c10fa3feb780a5eadfe203abed52dea
TreeHugger Robot [Wed, 12 Jun 2019 05:40:53 +0000 (05:40 +0000)]
Merge "Increased toggling area" into qt-r1-dev
joshmccloskey [Sat, 8 Jun 2019 00:23:44 +0000 (17:23 -0700)]
Increased toggling area
Test: Tapping the whole area will now toggle the switch. Note that
it is no longer possible to individually select the title and subtitle during
talkback, but you can select them as a group.
Test: Verified that without talkback the user must actually press
switch.
Fixes:
130398575
Change-Id: I369637f23e41ac6dc4333293b95a5ccae259ee1f
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: I3ac299e4e8b591a54ebb082d57e4dd408152029c
TreeHugger Robot [Tue, 11 Jun 2019 21:20:12 +0000 (21:20 +0000)]
Merge "Update mainline module versions string." into qt-dev
Antony Sargent [Tue, 11 Jun 2019 20:12:52 +0000 (13:12 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev
am:
5836158f2e
Change-Id: I3cfdbf15953adff2133ec4e59195c0403701c13e
TreeHugger Robot [Tue, 11 Jun 2019 20:06:54 +0000 (20:06 +0000)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev
TreeHugger Robot [Tue, 11 Jun 2019 19:13:45 +0000 (19:13 +0000)]
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
tmfang [Tue, 11 Jun 2019 17:46:32 +0000 (10:46 -0700)]
Fix overlapping problem on notification screen
am:
564fcb90ab
Change-Id: I4843fe2b835b5487695ccb522848127028042d4c
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
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
Yi Jiang [Wed, 5 Jun 2019 20:20:42 +0000 (13:20 -0700)]
Show a 'permission missing' message in Screen Attention settings.
Bug:
129284701
Test: Manually verified.
Test: atest AdaptiveSleepSettingsTest
Change-Id: I6375929d59479a0aeb7e4aec184bd36e7f3ab33b
TreeHugger Robot [Mon, 10 Jun 2019 23:21:06 +0000 (23:21 +0000)]
Merge "Hide color mode in search during A11y" into qt-r1-dev
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
Kevin Chang [Mon, 10 Jun 2019 01:12:44 +0000 (18:12 -0700)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev
am:
102d43b5c1
Change-Id: I12f498a313f5920940d49553f0c11c5619a7a4eb
Kevin Chang [Mon, 10 Jun 2019 00:57:14 +0000 (00:57 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev
TreeHugger Robot [Sun, 9 Jun 2019 02:29:19 +0000 (02:29 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Sun, 9 Jun 2019 00:42:07 +0000 (17:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
b567faffaa -s ours
am skip reason: subject contains skip directive
Change-Id: If9388b9fa0837bee7929f3aa1227e6e3391215ba
TreeHugger Robot [Sun, 9 Jun 2019 00:31:00 +0000 (00:31 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sat, 8 Jun 2019 19:26:23 +0000 (12:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7b9956f00ad7c2e77e75dddb64a3ee70cc72fa78
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
Lorenzo Colitti [Sat, 8 Jun 2019 06:51:32 +0000 (23:51 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am:
2bcfecdb21
Change-Id: I1108a0f097e7f6b1fc47f2551f18e6316688a8f9
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
Kevin Chyn [Sat, 8 Jun 2019 04:07:07 +0000 (21:07 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
am:
eeecb3e24d
Change-Id: I4d38ec9a0ffa4dbcffee9b5b7e31c20fd5bd3c7b
Kevin Chyn [Fri, 7 Jun 2019 22:44:49 +0000 (22:44 +0000)]
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
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
Kevin Chyn [Fri, 7 Jun 2019 19:41:05 +0000 (12:41 -0700)]
Do not stay on education page if user has enrolled max templates
Fixes:
134769754
Test: Enroll max templates, go back, intro screen is seen instead
Change-Id: I4a5f8d71abff88688f7c77860bb44caa95d17d61
Joshua Mccloskey [Fri, 7 Jun 2019 19:15:11 +0000 (19:15 +0000)]
Merge "Updating colors for dark theme" into qt-r1-dev
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
George Chang [Fri, 7 Jun 2019 06:29:07 +0000 (23:29 -0700)]
Fix NFC state switched off every time user entered connection preferences page
am:
e4c2e427a1
Change-Id: I52186dbe7b550fd6ab2ae0bccdba80ac1e779b1f
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
joshmccloskey [Thu, 6 Jun 2019 23:13:59 +0000 (16:13 -0700)]
Updating colors for dark theme
Bug:
133277663
Test: Verified colors are correct for dark & light themes.
Change-Id: If1aa5f22286d15918cfec3cd4a6436760bf304b2
Yi Jiang [Thu, 6 Jun 2019 20:06:21 +0000 (20:06 +0000)]
Merge "Fix screen attention contextual card" into qt-r1-dev
Julia Reynolds [Thu, 6 Jun 2019 19:00:54 +0000 (12:00 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
am:
f58cd0fb51
Change-Id: I39f53bcf9665291fb3961e7358aec09e60a310e7
TreeHugger Robot [Thu, 6 Jun 2019 18:36:57 +0000 (18:36 +0000)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
Mehdi Alizadeh [Thu, 6 Jun 2019 18:28:39 +0000 (11:28 -0700)]
Updates System Navigation strings
am:
14a1b19735
Change-Id: Ifd443b394ce19ceb0c0fe94abbaaa31d9158c475
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
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
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
Andy Chou [Thu, 6 Jun 2019 02:51:46 +0000 (19:51 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am:
a9e8c50764
Change-Id: I7e32848cd240b43e93533f5575202b1122620dee
Antony Sargent [Thu, 6 Jun 2019 02:51:13 +0000 (19:51 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
am:
68a26e5535
Change-Id: I1ab73ba3e6e666a42590030d9dd6903f257b070a
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
Antony Sargent [Thu, 6 Jun 2019 00:19:16 +0000 (00:19 +0000)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
Yi Jiang [Wed, 5 Jun 2019 23:35:51 +0000 (23:35 +0000)]
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
Yi Jiang [Wed, 5 Jun 2019 03:14:10 +0000 (20:14 -0700)]
Fix screen attention contextual card
Bug:
134537004
Bug:
134537730
Test: Manually verified.
Test: make RunSettingsRoboTests
Change-Id: Ib5dd6444b70a5575863be985f58b48f00f505e53
Julia Reynolds [Wed, 5 Jun 2019 21:49:45 +0000 (14:49 -0700)]
Merge "Read the subtext of notif importance field on selection" into qt-dev
am:
3f95fda1cf
Change-Id: Icc507ca10f4c657593ed1c6b6cb9d93c0b01f8fe
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
Suprabh Shukla [Wed, 5 Jun 2019 21:34:45 +0000 (14:34 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied
am:
732edc3e39
Change-Id: I891d88a7fa0769ce22eb7b79cb5f6dcf5d1457ac
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
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
TreeHugger Robot [Wed, 5 Jun 2019 20:25:31 +0000 (20:25 +0000)]
Merge "Hide color mode when unavailable" into qt-r1-dev
Yi Jiang [Tue, 4 Jun 2019 19:08:42 +0000 (12:08 -0700)]
use different description strings for screen attention settings and contextual card
1. Revert the screen attention description string to the old approved
string.
2. Create a new summary string for 'Screen Attention' contextual slice.
3. Fix some character issues.
Bug:
134457354
Bug:
134585794
Test: make RunSettingsRoboTests -j 32
Change-Id: I401fc6707203790e51aed8738b4658c6a30f512e
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
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 18:21:32 +0000 (11:21 -0700)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am:
13cbb2eea2
Change-Id: I9b9799889ce5e3474ccfcdd4b33dfafcd0092e0e
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
Anthony Han [Wed, 29 May 2019 00:34:36 +0000 (17:34 -0700)]
Hide color mode in search during A11y
Bug:
133527869
Test: make ROBOTEST_FILTER="(ColorMode*)" RunSettingsRoboTests
Change-Id: Iac1146e6bfb391553b05f44fded2db17414b4605
Anthony Han [Fri, 24 May 2019 23:46:40 +0000 (16:46 -0700)]
Hide color mode when unavailable
When no color modes are available, make the setting unsearchable.
Bug:
131035509
Test: make ROBOTEST_FILTER="(ColorMode*)" RunSettingsRoboTests
Change-Id: I2dca681b981b646858c3ae1af4fafbee74fd06ee
TreeHugger Robot [Wed, 5 Jun 2019 15:30:52 +0000 (15:30 +0000)]
Merge "New strings for "Automatically lock"" into qt-r1-dev
Raff Tsai [Wed, 5 Jun 2019 09:36:08 +0000 (02:36 -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:
acac31e75a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: Ib8f332a5ac80342106e25b07e5f40fb740fca033
Raff Tsai [Wed, 5 Jun 2019 09:35:44 +0000 (02:35 -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:
290b4e507c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I591d8c07e4e21109315a9b7b600b52ba7000c3cc
Raff Tsai [Wed, 5 Jun 2019 09:35:02 +0000 (02:35 -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:
ca593c204a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I4ef72ed7f78528edf72d003de251542d22515025
Raff Tsai [Wed, 5 Jun 2019 09:34:53 +0000 (02:34 -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:
f7cd796ea8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I3cf51b30f82e33d55b49863d58fa27544a8ff0eb