Commit Graph

18119 Commits

Author SHA1 Message Date
Fan Zhang
2c9bd6707d Merge "Update mainline module versions string." into qt-dev
am: 2aa94b97c7

Change-Id: I0004f9860c2c8f16be3612c165b3e2a40031819c
2019-06-11 14:38:42 -07:00
Fan Zhang
a621f8a374 Merge "Update mainline module versions string." into qt-dev
am: 2aa94b97c7

Change-Id: I3ac299e4e8b591a54ebb082d57e4dd408152029c
2019-06-11 14:38:42 -07:00
TreeHugger Robot
2aa94b97c7 Merge "Update mainline module versions string." into qt-dev 2019-06-11 21:20:12 +00:00
Antony Sargent
f0e3ac6f27 Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
am: 5d186f5346

Change-Id: Ib92cedd28e291ba8e606f21883a7d69e73251a5c
2019-06-11 13:19:53 -07:00
Antony Sargent
af8fa25cfd Merge "Remove on/off toggle for physical SIMs" into qt-dev
am: 5836158f2e

Change-Id: Idfe1855b09448feea3036185f092b3f56b10f18e
2019-06-11 13:13:52 -07:00
Antony Sargent
5d186f5346 Merge "Remove on/off toggle for physical SIMs" into qt-dev
am: 5836158f2e

Change-Id: I3cfdbf15953adff2133ec4e59195c0403701c13e
2019-06-11 13:12:52 -07:00
Yi Jiang
ecbaa00855 Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
am: 9fb76d02bb

Change-Id: I4131b9f13778ccb1c05ff60a94ebfc49a02319cf
2019-06-11 12:28:15 -07:00
TreeHugger Robot
9fb76d02bb Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev 2019-06-11 19:13:45 +00: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
Antony Sargent
e548fc6334 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
2019-06-10 14:41:08 -07:00
Kevin Chang
d09d7b078d Merge "Add tutorial dialog for gesture navigation" into qt-dev
am: 102d43b5c1

Change-Id: I12f498a313f5920940d49553f0c11c5619a7a4eb
2019-06-09 18:12:44 -07:00
Kevin Chang
102d43b5c1 Merge "Add tutorial dialog for gesture navigation" into qt-dev 2019-06-10 00:57:14 +00:00
TreeHugger Robot
af6b60c523 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-09 02:29:19 +00:00
Bill Yi
096babc3ec Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7b9956f00ad7c2e77e75dddb64a3ee70cc72fa78
2019-06-08 12:26:23 -07:00
Bill Yi
d2347cabdb Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If595c532cf6a8e9724c74c96b29356ab1bdb65b0
2019-06-08 12:01:55 -07:00
Joshua Mccloskey
df8ef0d9bb Merge "Updating colors for dark theme" into qt-r1-dev
am: 6d24819758

Change-Id: Icde71ef65279e29bf64c0005e29e9db004550054
2019-06-07 12:28:31 -07:00
joshmccloskey
10576db765 Updating colors for dark theme
Bug: 133277663
Test: Verified colors are correct for dark & light themes.
Change-Id: If1aa5f22286d15918cfec3cd4a6436760bf304b2
2019-06-06 16:48:29 -07:00
Yi Jiang
02777d3e1b Merge "Fix screen attention contextual card" into qt-r1-dev
am: 03c47e7687

Change-Id: Ic7a425c3662d834da23629d9fd98dc5fc39e4ccc
2019-06-06 13:23:32 -07:00
Yi Jiang
03c47e7687 Merge "Fix screen attention contextual card" into qt-r1-dev 2019-06-06 20:06:21 +00:00
Mehdi Alizadeh
1781d93ff3 Updates System Navigation strings am: 14a1b19735
am: cde53dc119

Change-Id: Id431c8e6b12611b00af1b3e34ad7b66deddc49fa
2019-06-06 11:31:42 -07:00
Mehdi Alizadeh
cde53dc119 Updates System Navigation strings
am: 14a1b19735

Change-Id: Ifd443b394ce19ceb0c0fe94abbaaa31d9158c475
2019-06-06 11:28:39 -07:00
Mehdi Alizadeh
14d77491cf Updates System Navigation strings
am: 14a1b19735

Change-Id: I86d6eab41c4c5d04d4311ce7699f55546f29cebf
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
Kevin Chang
abee9d52e4 Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
am: 52482edb2b

Change-Id: Ifecf327f3cd13efe708e99c697afd44b13e24f74
2019-06-06 02:17:06 -07:00
Kevin Chang
52482edb2b Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp 2019-06-06 09:04:42 +00:00
Kevin Chang
9ff00646d0 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
2019-06-06 06:20:49 +00:00
Kevin Chang
0e1f39fad8 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
2019-06-06 13:56:54 +08: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
Antony Sargent
2082b0e969 Merge "Strings for pSIM on/off toggle removal" into qt-dev
am: 68a26e5535

Change-Id: I1ab73ba3e6e666a42590030d9dd6903f257b070a
2019-06-05 19:51:13 -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
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
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
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
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
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
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
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
TreeHugger Robot
3d9c7cb356 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-05 00:23:38 +00: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