Commit Graph

54338 Commits

Author SHA1 Message Date
Jonathan Scott
a945243b5c [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController.
Bug: 127605586
Test: Manual
Change-Id: Id85632b5e6975fc5f92d6e8126a6603a07f097e1
(cherry picked from commit 687b18067c)
2019-06-12 09:55:46 +00:00
joshmccloskey
388b26d4d5 Merge "Increased toggling area" into qt-r1-dev
am: a854373bee

Change-Id: I628397789acf5a7b879a52f3d12cc9786d0869e2
2019-06-11 22:51:01 -07:00
TreeHugger Robot
a854373bee Merge "Increased toggling area" into qt-r1-dev 2019-06-12 05:40:53 +00:00
android-build-team Robot
2ef5d64b3c Merge "Snap for 5652499 from 2aa94b97c7 to qt-release" into qt-release 2019-06-12 03:48:52 +00:00
android-build-team Robot
defde60784 Merge "Snap for 5652499 from 2aa94b97c7 to qt-release" into qt-release 2019-06-12 03:28:21 +00:00
android-build-team Robot
d03e969e93 Snap for 5652499 from 2aa94b97c7 to qt-release
Change-Id: I40f55b96a8f66f91edc3f16d2864c1bb5a83b873
2019-06-12 03:17:22 +00:00
android-build-team Robot
44f84a27fd Snap for 5652499 from 2aa94b97c7 to qt-release
Change-Id: If204c82935a358d336b1e6e59c5ee6fc2e55992c
2019-06-12 03:17:05 +00:00
android-build-team Robot
57f2322e57 Snap for 5652499 from 2aa94b97c7 to qt-release
Change-Id: I7f21207cae35e2cdbaf9c5837a44cbec41d8028a
2019-06-12 03:02:43 +00:00
joshmccloskey
c2cb46782c Increased toggling area
Test: Tapping the whole area will now toggle the switch. Note that
it is no longer possible to individually select the title and subtitle during
talkback, but you can select them as a group.
Test: Verified that without talkback the user must actually press
switch.
Fixes: 130398575

Change-Id: I369637f23e41ac6dc4333293b95a5ccae259ee1f
2019-06-12 02:57:17 +00:00
Fan Zhang
32ae5db2ee Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
am: a621f8a374

Change-Id: Iaafcb9bcc773ecf48fe2e4d57ab8b8ee6223654e
2019-06-11 14:44:43 -07:00
Fan Zhang
2bbb1bf2e0 Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
am: 2c9bd6707d

Change-Id: Id9bb6359eaf6ddd60237c929522418ea291412d5
2019-06-11 14:42:45 -07:00
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
Android Build Merger (Role)
7a952730bd Merge "Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e am: af8fa25cfd" into qt-r1-dev-plus-aosp 2019-06-11 20:20:05 +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
9d1961e074 Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
am: af8fa25cfd

Change-Id: I51513b2df9aa1d5f22cdb118abe4935f0193e6ec
2019-06-11 13:19:51 -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
TreeHugger Robot
5836158f2e Merge "Remove on/off toggle for physical SIMs" into qt-dev 2019-06-11 20:06:54 +00: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
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
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
android-build-team Robot
b6aeb67b26 Snap for 5649081 from 102d43b5c1 to qt-release
Change-Id: I606152e217799a73ed699dd9b05d9c5b84665948
2019-06-11 03:03:00 +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
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
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
android-build-team Robot
bb0b6246d5 Snap for 5645951 from b567faffaa to qt-release
Change-Id: I52b0620bdd5f874156cf1eca827f6343dde867d0
2019-06-09 23:03:10 +00: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
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
android-build-team Robot
ab46732f13 Snap for 5645017 from 2bcfecdb21 to qt-release
Change-Id: I87b7cdd74db6c108706bae3448421444779cecea
2019-06-08 23:13:33 +00:00