Andy Chou
3d43db4e50
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am: a9e8c50764
...
am: 8c0d669d6e
2019-06-05 20:27:25 -07:00
Antony Sargent
74401c6716
Merge "Strings for pSIM on/off toggle removal" into qt-dev am: 68a26e5535
...
am: 5cdf1955f4
2019-06-05 20:27:01 -07:00
Andy Chou
768691520b
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
...
am: a9e8c50764
2019-06-05 19:51:46 -07:00
Antony Sargent
2082b0e969
Merge "Strings for pSIM on/off toggle removal" into qt-dev
...
am: 68a26e5535
2019-06-05 19:51:13 -07:00
Andy Chou
8c0d669d6e
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
...
am: a9e8c50764
2019-06-05 19:49:12 -07:00
Antony Sargent
5cdf1955f4
Merge "Strings for pSIM on/off toggle removal" into qt-dev
...
am: 68a26e5535
2019-06-05 19:47:52 -07:00
Andy Chou
a9e8c50764
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
2019-06-06 00:35:16 +00:00
Antony Sargent
68a26e5535
Merge "Strings for pSIM on/off toggle removal" into qt-dev
2019-06-06 00:19:16 +00:00
Yi Jiang
b7098b181f
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
...
am: d81e2c36f6
2019-06-05 17:10:30 -07:00
Yi Jiang
d81e2c36f6
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
2019-06-05 23:35:51 +00:00
Yi Jiang
068062d423
Fix screen attention contextual card
...
Bug: 134537004
Bug: 134537730
Test: Manually verified.
Test: make RunSettingsRoboTests
Change-Id: Ib5dd6444b70a5575863be985f58b48f00f505e53
2019-06-05 16:20:30 -07:00
Julia Reynolds
6f0097e473
Merge "Read the subtext of notif importance field on selection" into qt-dev am: 3f95fda1cf
...
am: 559a72e27f
2019-06-05 16:08:20 -07:00
Suprabh Shukla
08ec3323c6
Kill uid when REQUEST_INSTALL_PACKAGES is denied am: 732edc3e39
...
am: d879318434
2019-06-05 16:06:30 -07:00
Anthony Han
04749dce13
Merge "Hide color mode when unavailable" into qt-r1-dev
...
am: 3472188437
2019-06-05 16:04:34 -07:00
Xiangyu/Malcolm Chen
8dcef5f789
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
...
am: f6ae3fa64a
2019-06-05 15:59:29 -07:00
Julia Reynolds
918fbfb364
Merge "Read the subtext of notif importance field on selection" into qt-dev am: 3f95fda1cf
...
am: 9994b66974
2019-06-05 14:55:20 -07:00
Julia Reynolds
559a72e27f
Merge "Read the subtext of notif importance field on selection" into qt-dev
...
am: 3f95fda1cf
2019-06-05 14:49:45 -07:00
Julia Reynolds
9994b66974
Merge "Read the subtext of notif importance field on selection" into qt-dev
...
am: 3f95fda1cf
2019-06-05 14:49:41 -07:00
Suprabh Shukla
e5d958cb0a
Kill uid when REQUEST_INSTALL_PACKAGES is denied am: 732edc3e39
...
am: 4929001e70
2019-06-05 14:40:44 -07:00
TreeHugger Robot
3f95fda1cf
Merge "Read the subtext of notif importance field on selection" into qt-dev
2019-06-05 21:37:17 +00:00
Suprabh Shukla
4929001e70
Kill uid when REQUEST_INSTALL_PACKAGES is denied
...
am: 732edc3e39
2019-06-05 14:34:46 -07:00
Suprabh Shukla
d879318434
Kill uid when REQUEST_INSTALL_PACKAGES is denied
...
am: 732edc3e39
2019-06-05 14:34:45 -07:00
Antony Sargent
3631ed9dee
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
2019-06-05 14:20:09 -07:00
Suprabh Shukla
732edc3e39
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
2019-06-05 21:15:17 +00:00
TreeHugger Robot
3472188437
Merge "Hide color mode when unavailable" into qt-r1-dev
2019-06-05 20:25:31 +00:00
Yi Jiang
9df180a008
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
2019-06-05 13:22:19 -07:00
Xiangyu/Malcolm Chen
b55caa7afc
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
...
am: 226715e54e
2019-06-05 11:35:09 -07:00
Julia Reynolds
569732474e
Read the subtext of notif importance field on selection
...
When using a11y services
Test: manual with Talkback
Bug: 133649570
Change-Id: Ic68a948ab5d55e68994e6b14456d25d438637886
2019-06-05 18:31:19 +00:00
Xiangyu/Malcolm Chen
226715e54e
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
...
am: 13cbb2eea2
2019-06-05 11:21:33 -07:00
Xiangyu/Malcolm Chen
f6ae3fa64a
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
...
am: 13cbb2eea2
2019-06-05 11:21:32 -07:00
Xiangyu/Malcolm Chen
13cbb2eea2
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
2019-06-05 18:03:17 +00:00
Anthony Han
19747eba0e
Hide color mode in search during A11y
...
Bug: 133527869
Test: make ROBOTEST_FILTER="(ColorMode*)" RunSettingsRoboTests
Change-Id: Iac1146e6bfb391553b05f44fded2db17414b4605
2019-06-05 10:44:05 -07:00
Anthony Han
000d8336de
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
2019-06-05 10:36:18 -07:00
Edgar Wang
1d9a0ec5f4
Merge "New strings for "Automatically lock"" into qt-r1-dev
...
am: 19eaefb17e
2019-06-05 08:40:30 -07:00
TreeHugger Robot
19eaefb17e
Merge "New strings for "Automatically lock"" into qt-r1-dev
2019-06-05 15:30:52 +00:00
Android Build Merger (Role)
7879a05148
Merge "[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: b1e65ea2af -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history" into qt-r1-dev-plus-aosp
2019-06-05 09:41:28 +00:00
Raff Tsai
adbec0222c
[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: b1e65ea2af5d9328571e
2019-06-05 02:41:18 -07:00
Raff Tsai
4994dfff37
[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: c212052f695d9328571e
2019-06-05 02:41:11 -07:00
Android Build Merger (Role)
f376fc4ecc
Merge "[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: 723fb8dc91 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history" into qt-r1-dev-plus-aosp
2019-06-05 09:41:00 +00:00
Raff Tsai
db61c64436
[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: 723fb8dc915d9328571e
2019-06-05 02:40:50 -07:00
Raff Tsai
433adc9043
[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: 592e5c14915d9328571e
2019-06-05 02:40:44 -07:00
Android Build Merger (Role)
e1e01667a7
Merge changes from topic "am-7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus-aosp
...
* changes:
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218eed126b5d960b52ca469365294e6ee5c808f15cbe0b36c5e9bae7c298885bca593c204a7d3edc88a9c968eacbbf5d9328571ee537ffece88f70c24f2d188904e631ceb1ed0a09bfe5b37bc8530fa8b25b20b5a01f6c2d387349dbf7cd796ea8152f4c8345c968eacbbf04208f16b06dbb3108a759348982d3d20d75c39b971190b08aab2ad075b305b744c5ebc968eacbbf
2019-06-05 09:40:35 +00:00
Raff Tsai
5e22a7d4dd
[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: 7d3edc88a9c968eacbbf
2019-06-05 02:40:04 -07:00
Raff Tsai
f12bc63c3c
[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: a9125587a4c968eacbbf
2019-06-05 02:39:59 -07:00
Raff Tsai
f9f19a8608
[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: 152f4c8345c968eacbbf
2019-06-05 02:39:52 -07:00
Raff Tsai
e944a78e21
[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: 7a7a4f3019c968eacbbf
2019-06-05 02:39:49 -07:00
Raff Tsai
de3cc29552
[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: ab2ad075b3 -s ours
...
am: 05b744c5ebc968eacbbf
2019-06-05 02:39:40 -07:00
Raff Tsai
012a9daccb
[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: ab2ad075b3 -s ours
...
am: a33cd2c168c968eacbbf
2019-06-05 02:39:39 -07:00
Raff Tsai
c212052f69
[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: acac31e75a5d9328571e
2019-06-05 02:36:10 -07:00
Raff Tsai
b1e65ea2af
[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: acac31e75a5d9328571e
2019-06-05 02:36:08 -07:00
