Andy Chou
d8ff88aa81
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am: a9e8c50764
am: 8c0d669d6e
...
am: 3d43db4e50
Change-Id: Icd7d4f913c47a25278d85098a84a9e789191d3b2
2019-06-05 20:46:46 -07:00
Antony Sargent
ed8e6fab8d
Merge "Strings for pSIM on/off toggle removal" into qt-dev am: 68a26e5535
am: 5cdf1955f4
...
am: 74401c6716
Change-Id: I21b01ce978f349887f9181c840eae3a71f2c9999
2019-06-05 20:44:33 -07:00
Yi Jiang
6985649b7e
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev am: d81e2c36f6
...
am: b7098b181f
Change-Id: I6cbea478176361733957adb06e63f1e9b58f1c8b
2019-06-05 20:40:29 -07:00
Andy Chou
3d43db4e50
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am: a9e8c50764
...
am: 8c0d669d6e
Change-Id: I5ff88b4ba6ff4a642834a3453438489ae2804dc2
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
Change-Id: I88335b8bb5cf4ac4bc4d279679d36dbd2194346f
2019-06-05 20:27:01 -07:00
Andy Chou
8c0d669d6e
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
...
am: a9e8c50764
Change-Id: I8d6b2b025fd039202eca5f6c8eefea1acb8f0e91
2019-06-05 19:49:12 -07:00
Antony Sargent
5cdf1955f4
Merge "Strings for pSIM on/off toggle removal" into qt-dev
...
am: 68a26e5535
Change-Id: I4d43b9a27284cf126c21ae7ab9089d2d79c0dc25
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
Change-Id: I34f211f8234fe883c1a646bd27f5d73ca0067463
2019-06-05 17:10:30 -07:00
Julia Reynolds
57b93bdad8
Merge "Read the subtext of notif importance field on selection" into qt-dev am: 3f95fda1cf
am: 559a72e27f
...
am: 6f0097e473
Change-Id: I2e017a0ce529907dcf2c80d1d69f2d4688d7c469
2019-06-05 16:57:32 -07:00
Suprabh Shukla
07023705a5
Kill uid when REQUEST_INSTALL_PACKAGES is denied am: 732edc3e39
am: d879318434
...
am: 08ec3323c6
Change-Id: Ic54fc5079a92077424760c4c42b01a9d9c0c69e9
2019-06-05 16:55:02 -07:00
Anthony Han
94bb7cf9f1
Merge "Hide color mode when unavailable" into qt-r1-dev am: 3472188437
...
am: 04749dce13
Change-Id: Ifd067bf50fec2df7b13aecdfe57c4a26fb15d25f
2019-06-05 16:51:22 -07:00
Xiangyu/Malcolm Chen
33740d8677
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
am: f6ae3fa64a
...
am: 8dcef5f789
Change-Id: Ia842fc4a4d97af6559626d0c8aefde62199a283e
2019-06-05 16:42:38 -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
Julia Reynolds
6f0097e473
Merge "Read the subtext of notif importance field on selection" into qt-dev am: 3f95fda1cf
...
am: 559a72e27f
Change-Id: I667202b439e1860d8345f5b0c9eefcfaab5af246
2019-06-05 16:08:20 -07:00
Suprabh Shukla
08ec3323c6
Kill uid when REQUEST_INSTALL_PACKAGES is denied am: 732edc3e39
...
am: d879318434
Change-Id: I6ac28db9ba20bd4b0d002094454e6200811aa035
2019-06-05 16:06:30 -07:00
Anthony Han
04749dce13
Merge "Hide color mode when unavailable" into qt-r1-dev
...
am: 3472188437
Change-Id: I434297d5c0c7332270195df48554fdf45f65a251
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
Change-Id: I5a5e42a31c62f8c3b2150cd44d16aa6228f77d24
2019-06-05 15:59:29 -07:00
Julia Reynolds
923263f5f7
Merge "Read the subtext of notif importance field on selection" into qt-dev am: 3f95fda1cf
am: 9994b66974
...
am: 918fbfb364
Change-Id: Ibf4b20764cd8aa1d34600fc215836db15a78bd7a
2019-06-05 14:59:20 -07:00
Julia Reynolds
918fbfb364
Merge "Read the subtext of notif importance field on selection" into qt-dev am: 3f95fda1cf
...
am: 9994b66974
Change-Id: Ibbc9edc50bd13fc8c4e8a8f3cd819c3beea99881
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
Change-Id: Icc507ca10f4c657593ed1c6b6cb9d93c0b01f8fe
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
Change-Id: I5829b1539c480e5c2f3598c57eb5bde7cdcd4d5f
2019-06-05 14:49:41 -07:00
Suprabh Shukla
f8cbeef9a9
Kill uid when REQUEST_INSTALL_PACKAGES is denied am: 732edc3e39
am: 4929001e70
...
am: e5d958cb0a
Change-Id: I8260ef8790cc455a1025b35a07681cfb80b96ba9
2019-06-05 14:47:47 -07:00
Suprabh Shukla
e5d958cb0a
Kill uid when REQUEST_INSTALL_PACKAGES is denied am: 732edc3e39
...
am: 4929001e70
Change-Id: Id759c1c02118401c6213f43cd21134267fc10740
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
Change-Id: Id88443ad3face92fa3d28622207c49f94c7eb002
2019-06-05 14:34:46 -07:00
Suprabh Shukla
d879318434
Kill uid when REQUEST_INSTALL_PACKAGES is denied
...
am: 732edc3e39
Change-Id: I891d88a7fa0769ce22eb7b79cb5f6dcf5d1457ac
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
d9d9a79d31
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
am: 226715e54e
...
am: b55caa7afc
Change-Id: I7d5c7d1715a558d281851e54b44ee915d6f41bd5
2019-06-05 11:49:35 -07:00
Xiangyu/Malcolm Chen
b55caa7afc
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am: 13cbb2eea2
...
am: 226715e54e
Change-Id: I64ef08b8d8b5215a20017e70f36678d4f2d8c510
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
Change-Id: I8ba31e7278d911bf6cef19e46d06ed964ae9e36f
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
Change-Id: I9b9799889ce5e3474ccfcdd4b33dfafcd0092e0e
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
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
e3ee5e32c3
Merge "New strings for "Automatically lock"" into qt-r1-dev am: 19eaefb17e
...
am: 1d9a0ec5f4
Change-Id: I3acd5eb888cfe50c087db6757eee4affa76cb581
2019-06-05 08:46:33 -07:00
Edgar Wang
1d9a0ec5f4
Merge "New strings for "Automatically lock"" into qt-r1-dev
...
am: 19eaefb17e
Change-Id: I83d75e232242340a20d006ccfa2697ef4d6301a1
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
TreeHugger Robot
205520bea1
Merge "Fix BatteryTipDialogFragmentTest"
2019-06-05 12:29:31 +00:00
Pasty Chang
2624615676
Merge "Fix overlapped text in lockscreen pattern setup"
2019-06-05 12:10:49 +00:00
tmfang
1392e6c979
Fix BatteryTipDialogFragmentTest
...
Test case can't get application info. We add test app information
in packagemanager in setup().
Test: atest BatteryTipDialogFragmentTest
Fixes: 134451831
Change-Id: I687f5f3a52ba8af346dbd0d798e4eee34a583870
2019-06-05 10:10:49 +00:00
Raff Tsai
df160a501d
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: 7879a05148
-s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e
is in history
Change-Id: I8ef28c25fbdd3879a7d56f4f1e1486758446f223
2019-06-05 02:48:08 -07:00
Raff Tsai
82e42390cc
[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: c212052f69
-s ours
...
am: 4994dfff37
-s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e
is in history
Change-Id: I2362b0023cb47997d68361bbd95059a2fec0a8ac
2019-06-05 02:47:30 -07:00
Raff Tsai
5df942b0e9
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: f376fc4ecc
-s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e
is in history
Change-Id: I2c9d46d7f1a73e825283797ecd8aeccfee8834f1
2019-06-05 02:47:05 -07:00
Raff Tsai
243eaaf17b
[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: 592e5c1491
-s ours
...
am: 433adc9043
-s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e
is in history
Change-Id: I5697c7185cca74e551b21783af668344ba3e4e72
2019-06-05 02:46:34 -07:00
Raff Tsai
cd43d22537
[automerger skipped] Merge changes from topic "am-7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus-aosp
...
am: e1e01667a7
-s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e
is in history
Change-Id: I3328670fc4b4f89dcbaf0c2639713dde041e807b
2019-06-05 02:46:03 -07:00