Yanting Yang
3a0e5742a9
Fix bulleted list 2nd align issue in reset dialog
...
Bullet <li> was impacted by the spaces and newlines from string.
Tweak multi-lines to one line to correct the 2nd lines alignment.
Fixes: 132335156
Test: visual
Change-Id: I5af32cf373c7702d5fc8891a06c2cdffc6a01e0a
2019-06-14 19:43:04 +08:00
Michael Groover
d207e7a4ca
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942 am: 628d311d0c
...
am: edef325b20
2019-06-12 14:56:13 -07:00
Michael Groover
edef325b20
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
...
am: 628d311d0c
2019-06-12 14:33:33 -07:00
Michael Groover
628d311d0c
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
...
am: ad85d6b942
2019-06-12 14:20:33 -07:00
Michael Groover
ad85d6b942
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
2019-06-12 20:31:16 +00:00
Fan Zhang
33caf61878
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7 am: 2c9bd6707d
...
am: 2bbb1bf2e0
2019-06-11 14:47:44 -07:00
Fan Zhang
2bbb1bf2e0
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
...
am: 2c9bd6707d
2019-06-11 14:42:45 -07:00
Fan Zhang
a621f8a374
Merge "Update mainline module versions string." into qt-dev
...
am: 2aa94b97c7
2019-06-11 14:38:42 -07:00
Fan Zhang
2c9bd6707d
Merge "Update mainline module versions string." into qt-dev
...
am: 2aa94b97c7
2019-06-11 14:38:42 -07:00
Yi Jiang
878476e9ba
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev am: 9fb76d02bb
...
am: ecbaa00855
2019-06-11 12:34:56 -07:00
Yi Jiang
ecbaa00855
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
...
am: 9fb76d02bb
2019-06-11 12:28:15 -07:00
Fan Zhang
308a532852
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
2019-06-11 02:31:25 +00:00
Yi Jiang
c26745207d
Show a 'permission missing' message in Screen Attention settings.
...
Bug: 129284701
Test: Manually verified.
Test: atest AdaptiveSleepSettingsTest
Change-Id: I6375929d59479a0aeb7e4aec184bd36e7f3ab33b
2019-06-10 17:18:10 -07:00
Mehdi Alizadeh
2991fd1b23
Updates System Navigation strings am: 14a1b19735 am: cde53dc119
...
am: 1781d93ff3
2019-06-06 11:45:57 -07:00
Mehdi Alizadeh
1781d93ff3
Updates System Navigation strings am: 14a1b19735
...
am: cde53dc119
2019-06-06 11:31:42 -07:00
Mehdi Alizadeh
cde53dc119
Updates System Navigation strings
...
am: 14a1b19735
2019-06-06 11:28:39 -07:00
Mehdi Alizadeh
14d77491cf
Updates System Navigation strings
...
am: 14a1b19735
2019-06-06 11:28:39 -07:00
Mehdi Alizadeh
14a1b19735
Updates System Navigation strings
...
Bug: 134517326
Test: Verified manually
Change-Id: I777cfdc3a760040fdea745c5247152c5ff0d6218
2019-06-06 18:06:57 +00:00
Antony Sargent
ed8e6fab8d
Merge "Strings for pSIM on/off toggle removal" into qt-dev am: 68a26e5535 am: 5cdf1955f4
...
am: 74401c6716
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
2019-06-05 20:40:29 -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
Antony Sargent
2082b0e969
Merge "Strings for pSIM on/off toggle removal" into qt-dev
...
am: 68a26e5535
2019-06-05 19:51:13 -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
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
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
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
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
2019-06-05 11:35:09 -07: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
Edgar Wang
e3ee5e32c3
Merge "New strings for "Automatically lock"" into qt-r1-dev am: 19eaefb17e
...
am: 1d9a0ec5f4
2019-06-05 08:46:33 -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
Edgar Wang
e1a000f94f
New strings for "Automatically lock"
...
Bug: 132106803
Test: manual
Change-Id: If6fe328ef6570cd96906435eb635576b324269c0
2019-06-05 17:19:48 +08:00
Michael Groover
2123e3543c
Remove developer option to disable device ID access restrictions
...
Bug: 123937881
Test: Manually verified developer option is no longer available.
Change-Id: I00e8db23d88a5c84e273dfa4b8f797fa2a995de0
2019-06-04 18:30:21 -07:00
Malcolm Chen
57badc2a82
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
2019-06-04 17:11:09 -07:00
Alan Stokes
7b707bb204
Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d am: dd1545b098
...
am: c912a02f50
2019-06-04 07:53:23 -07:00
Alan Stokes
c912a02f50
Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
...
am: dd1545b098
2019-06-04 07:43:00 -07:00
Alan Stokes
5b09f510e2
Merge "Cleanup background activity starts for release." into qt-dev
...
am: c53f5ecb3d
2019-06-04 07:38:04 -07:00
Alan Stokes
dd1545b098
Merge "Cleanup background activity starts for release." into qt-dev
...
am: c53f5ecb3d
2019-06-04 07:38:00 -07:00
Alan Stokes
c53f5ecb3d
Merge "Cleanup background activity starts for release." into qt-dev
2019-06-04 14:26:29 +00:00
Kevin Chang
99735a39f7
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919 am: d2fa1e6baa
...
am: 487a0c2a57
2019-06-03 19:01:29 -07:00
Kevin Chang
487a0c2a57
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919
...
am: d2fa1e6baa
2019-06-03 18:48:20 -07:00
Kevin Chang
267321cd81
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
...
am: 68aa4e4919
2019-06-03 18:42:10 -07:00
Kevin Chang
d2fa1e6baa
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
...
am: 68aa4e4919
2019-06-03 18:41:08 -07:00
Kevin Chang
68aa4e4919
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
2019-06-04 01:29:21 +00:00
Lucas Dupin
a1e19f1349
Merge "Longer character limit" into qt-r1-dev am: a448cb9d07
...
am: 64dad09e02
2019-06-03 16:12:24 -07:00
Lucas Dupin
64dad09e02
Merge "Longer character limit" into qt-r1-dev
...
am: a448cb9d07
2019-06-03 16:04:59 -07:00
