Commit Graph

54469 Commits

Author SHA1 Message Date
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
TreeHugger Robot
5836158f2e Merge "Remove on/off toggle for physical SIMs" into qt-dev 2019-06-11 20:06:54 +00:00
Yi Jiang
878476e9ba Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev am: 9fb76d02bb
am: ecbaa00855

Change-Id: I01a2ce816150cac7e14f046904b333c93bea49c9
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

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
tmfang
ef5766906c Fix overlapping problem on notification screen am: 564fcb90ab am: a5715f7d9c
am: 003bdbf7cc

Change-Id: If81ab3a8d637fc16953905b6262ad85d78260b9f
2019-06-11 11:02:08 -07:00
tmfang
dad177ada4 Fix overlapping problem on notification screen am: 564fcb90ab am: 1c474bf789
am: 114864981a

Change-Id: I1dcbbdece7db796fe2a83fc9c81c88d794534319
2019-06-11 10:59:45 -07:00
tmfang
003bdbf7cc Fix overlapping problem on notification screen am: 564fcb90ab
am: a5715f7d9c

Change-Id: I06f96d7f366ec3efa9b656c5dbe5d349435e9f60
2019-06-11 10:55:08 -07:00
tmfang
114864981a Fix overlapping problem on notification screen am: 564fcb90ab
am: 1c474bf789

Change-Id: I39a2ee35350be2439cab8f3718ecc68fc99c4c82
2019-06-11 10:52:47 -07:00
tmfang
a5715f7d9c Fix overlapping problem on notification screen
am: 564fcb90ab

Change-Id: I4843fe2b835b5487695ccb522848127028042d4c
2019-06-11 10:46:32 -07:00
tmfang
1c474bf789 Fix overlapping problem on notification screen
am: 564fcb90ab

Change-Id: I22700badde84ab5a723b41d59fbd72a9f751452e
2019-06-11 10:45:44 -07:00
Fan Zhang
933786b399 Merge changes I05beec7d,Iad4e9fc2
* changes:
  Remove "platform_slice" attribute from Settings.
  Use slice uri from slice index db directly.
2019-06-11 17:12:12 +00:00
Yi-Ling Chuang
d6bd5b1339 Update sound summary when it is set to None.
Currently when the sound is set to None, we don't update the summary,
unless users go to other pages and come back. Now we refreash it for a
better user experience.

Fixes: 134994978
Test: robotest
Change-Id: I5d9c0238ee31e0c26ebde3201794c17737791c62
2019-06-11 17:21:58 +08:00
Arc Wang
751eba205b [Wi-Fi DPP] Support WPA2/WPA3 transition mode
This change shows buttons of QR code scnanner and QR code generator
for a connected Wi-Fi network.

Bug: 134706055
Test: Generate QR code for a WPA2/WPA3 personal transition mode Wi-Fi AP
          and check if the security type is WPA2 personal.
      Generate QR code for open network.
      Generate QR code for OWE network.
      Scan a QR code of open network, verify connection.
      Scan a QR code of OWE network, verify connection.
      Scan a QR code of WPA3 network, verify connection.
      Scan a QR code of WPA3 network, verify transition mode connection.

Change-Id: I60f2c38585f85745f992fa63a5ea85312f08c5e5
2019-06-11 15:10:43 +08:00
tmfang
564fcb90ab 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
2019-06-11 13:57:57 +08: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
Anthony Han
9c79591c42 Merge "Hide color mode in search during A11y" into qt-r1-dev am: 9eaf5de974
am: f43839da91

Change-Id: Iace1bdf9a10c85ed9e04ae2d8425f79f42606233
2019-06-10 17:53:21 -07:00
Anthony Han
f43839da91 Merge "Hide color mode in search during A11y" into qt-r1-dev
am: 9eaf5de974

Change-Id: I91808e8c6fd981a1fc794d2584214036c8cb895c
2019-06-10 17:32:17 -07: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
TreeHugger Robot
9eaf5de974 Merge "Hide color mode in search during A11y" into qt-r1-dev 2019-06-10 23:21:06 +00: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
Fan Zhang
13cf250be5 Remove "platform_slice" attribute from Settings.
Bug: 126222433
Test: robo
Change-Id: I05beec7d3e3ec713c40740a1adbcacaee88237b5
2019-06-10 14:05:43 -07:00
Kevin Chang
8af10e6da7 Merge "[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1 am: d09d7b078d -s ours
am: f7b44051e9 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1 0e1f39fad8 is in history

Change-Id: I9e25cb5bfcdb206e302cdfd90196fe33c5411ded
2019-06-09 18:23:13 -07:00
Kevin Chang
e92c0b1804 [automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1 -s ours am: b2d8610c99 -s ours
am: a615d6d737 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1 0e1f39fad8 is in history

Change-Id: I3381b5f6151204d7997f84d467afb91124f32706
2019-06-09 18:22:45 -07:00
Android Build Merger (Role)
f7b44051e9 Merge "[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1 am: d09d7b078d -s ours am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1 0e1f39fad8 is in history" into qt-r1-dev-plus-aosp 2019-06-10 01:17:55 +00:00
Kevin Chang
89679608d7 [automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1
am: d09d7b078d -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1 0e1f39fad8 is in history

Change-Id: I4b9ccc7684b7eec7afd628e18d3853c227e185fd
2019-06-09 18:17:43 -07:00
Kevin Chang
a615d6d737 [automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1 -s ours
am: b2d8610c99 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1 0e1f39fad8 is in history

Change-Id: I53bd835bc715360953f385234f84cc2363e04375
2019-06-09 18:17:42 -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
b2d8610c99 [automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev
am: 102d43b5c1 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1 0e1f39fad8 is in history

Change-Id: I2539e4f01579937bfc201f1c0b3dfd55a0c79e56
2019-06-09 18:12:42 -07:00
Kevin Chang
102d43b5c1 Merge "Add tutorial dialog for gesture navigation" into qt-dev 2019-06-10 00:57:14 +00:00
Bill Yi
9c2bad63ae [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: af6b60c523 -s ours
am: 41d0fa8eff -s ours
am skip reason: subject contains skip directive

Change-Id: I2de634e0ad9f4584106c822088a96baabf5033d5
2019-06-08 19:43:19 -07:00
Bill Yi
41d0fa8eff [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: af6b60c523 -s ours
am skip reason: subject contains skip directive

Change-Id: Idd860e9f22ab1117549f848c08ca998b63e51469
2019-06-08 19:37:18 -07:00
TreeHugger Robot
af6b60c523 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-09 02:29:19 +00:00
TreeHugger Robot
82d594c53c Merge "Import translations. DO NOT MERGE" 2019-06-09 01:06:25 +00:00
Bill Yi
74d401c482 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours am: d4ac3ef39a -s ours
am: d9c00773e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I083727de78d915c2d261f8280d584e004b977d7b
2019-06-08 17:52:31 -07:00
Bill Yi
4c3d0e1c03 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours am: 49cc947902 -s ours
am: 7738e588ba -s ours
am skip reason: subject contains skip directive

Change-Id: If56b51c1bc3ce2a7c5da11eeadab7213414c30c6
2019-06-08 17:52:08 -07:00
Android Build Merger (Role)
d9c00773e9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours am: d4ac3ef39a -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-09 00:47:23 +00:00
Bill Yi
09bcb5c20f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours
am: d4ac3ef39a -s ours
am skip reason: subject contains skip directive

Change-Id: I34df32a7ca6f22128da89514139383bac56cd965
2019-06-08 17:47:07 -07:00
Bill Yi
7738e588ba [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours
am: 49cc947902 -s ours
am skip reason: subject contains skip directive

Change-Id: Icdc5d52a5b7a1d1e4bfa7f622364e6501bb298ea
2019-06-08 17:47:06 -07:00
Bill Yi
49cc947902 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: b567faffaa -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5627d075ca460287a52b3b1d2a17c1fb61fa969
2019-06-08 17:42:07 -07:00
Bill Yi
d4ac3ef39a [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
2019-06-08 17:42:07 -07:00
TreeHugger Robot
b567faffaa Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-09 00:31:00 +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
Bill Yi
2abdf5319c Import translations. DO NOT MERGE
Change-Id: Id2375b4bbdad6ab78fd8986fe5cc78d5fa697de7
Auto-generated-cl: translation import
2019-06-08 11:37:49 -07:00
Lorenzo Colitti
fb3000a5c8 Merge "Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21 am: 090cd1d05e" into qt-r1-dev-plus-aosp
am: 430def8e4a

Change-Id: I3931c3276092c582c6b58bf56b0d3082122b8456
2019-06-08 00:01:57 -07:00
Lorenzo Colitti
a1568c49d4 Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21 am: 4bee989ec1
am: 37bf2c4591

Change-Id: I6213316de4d3de257898f2ac23ee321aa8a24afb
2019-06-08 00:01:33 -07:00
Android Build Merger (Role)
430def8e4a Merge "Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21 am: 090cd1d05e" into qt-r1-dev-plus-aosp 2019-06-08 06:56:45 +00:00
Lorenzo Colitti
c0b15ae85f Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21
am: 090cd1d05e

Change-Id: I93cb100fcbda15dfd0eba3dff2be301bc26948f3
2019-06-07 23:56:32 -07:00
Lorenzo Colitti
37bf2c4591 Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21
am: 4bee989ec1

Change-Id: Iaaf336ee2d88654bc46fc3caaf5595f651c8f9ba
2019-06-07 23:56:31 -07:00