Commit Graph

53917 Commits

Author SHA1 Message Date
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
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
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
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
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
Lorenzo Colitti
4bee989ec1 Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am: 2bcfecdb21

Change-Id: I556ca5d18af9ea673216d63bef71ee9ca66d66ad
2019-06-07 23:51:32 -07:00
Lorenzo Colitti
090cd1d05e Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am: 2bcfecdb21

Change-Id: I1108a0f097e7f6b1fc47f2551f18e6316688a8f9
2019-06-07 23:51:32 -07:00
TreeHugger Robot
2bcfecdb21 Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev 2019-06-08 06:41:11 +00:00
Kevin Chyn
89dac52532 Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d
am: 4c4bad8e67

Change-Id: I0a3eda6c744c699af850a48e19180967558113b4
2019-06-07 21:12:07 -07:00
Kevin Chyn
482751b66e Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d
am: ee6cc56b68

Change-Id: Id0d8da3ec154b635a89799e106e2c8183aa1cba4
2019-06-07 21:11:43 -07:00
Kevin Chyn
ee6cc56b68 Only launch fingerprint settings after enrollment if it's from the summary controller
am: eeecb3e24d

Change-Id: I4d38ec9a0ffa4dbcffee9b5b7e31c20fd5bd3c7b
2019-06-07 21:07:07 -07:00
Kevin Chyn
4c4bad8e67 Only launch fingerprint settings after enrollment if it's from the summary controller
am: eeecb3e24d

Change-Id: I16becf1de78463e9379291f6273c963e850d4687
2019-06-07 21:06:08 -07:00
Kevin Chyn
a53cf34f7e Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
am: 7b5d1016f4

Change-Id: Idfc11df50ece3e3553fe6e45715716305c1b06e7
2019-06-07 16:04:05 -07:00
Kevin Chyn
7b5d1016f4 Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev 2019-06-07 22:44:49 +00:00
Kevin Chyn
eeecb3e24d Only launch fingerprint settings after enrollment if it's from the summary controller
Fixes: 133822544

Test: No more multiple instances of fingerprint settings after enrolling
      from within the settings page

Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL does not
      send the user to fingerprint settings after completing enrollment

Change-Id: I003dc142b01ed6ffae83299ab4b69f4896eb93e3
2019-06-07 15:13:29 -07:00
Kevin Chyn
c976efa3e6 Do not stay on education page if user has enrolled max templates
Fixes: 134769754

Test: Enroll max templates, go back, intro screen is seen instead
Change-Id: I4a5f8d71abff88688f7c77860bb44caa95d17d61
2019-06-07 12:41:05 -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
Joshua Mccloskey
6d24819758 Merge "Updating colors for dark theme" into qt-r1-dev 2019-06-07 19:15:11 +00:00
Lorenzo Colitti
5456b596a2 Disconnect if the user cancels the no/partial connectivity dialog
If the user exits the no Internet or partial connectivity dialog
without taking any action, there is no longer any way to use the
network. So, disconnect the network.

Bug: 130766237
Test: clicking outside dialog disconnects network
Test: orientation changes do not disconnect network
Change-Id: I80c2c98c994dc01e53b32f40332b3f1bd03b6012
2019-06-07 19:43:24 +09:00
Android Build Merger (Role)
771b5468b9 Merge "Fix NFC state switched off every time user entered connection preferences page am: e4c2e427a1 am: dc29b325a1" into qt-r1-dev-plus-aosp 2019-06-07 06:34:22 +00:00
George Chang
3119f580f8 Fix NFC state switched off every time user entered connection preferences page am: e4c2e427a1
am: dc29b325a1

Change-Id: I8a8ce7b773a0c5fa6ead761f288263fe7133ac1c
2019-06-06 23:34:09 -07:00
George Chang
ee0740c4d6 Fix NFC state switched off every time user entered connection preferences page am: e4c2e427a1
am: dc6a11a82a

Change-Id: Iccc2bcf6c1bec2b2ff9b3aa096ff1fb8c155f03b
2019-06-06 23:34:07 -07:00
George Chang
dc6a11a82a Fix NFC state switched off every time user entered connection preferences page
am: e4c2e427a1

Change-Id: If4545377b7c6196027b89514a91a2b7068f1202b
2019-06-06 23:29:07 -07:00
George Chang
dc29b325a1 Fix NFC state switched off every time user entered connection preferences page
am: e4c2e427a1

Change-Id: I52186dbe7b550fd6ab2ae0bccdba80ac1e779b1f
2019-06-06 23:29:07 -07:00
George Chang
e4c2e427a1 Fix NFC state switched off every time user entered connection preferences page
NfcAirplaneModeObserver added a scenario that
switched NFC off every time  a user entered connection
preferences page if airplane mode was on.
Even when a user manually switched on NFC, the observer would still
turn NFC off when re-entering connection preferences page.

GSAM TS.27 certification requires NFC state to be consistent
under AirplaneMode before and after reboot the device.
NfcAirplaneModeObserver breaks the requirement
because it would always switch NFC off under airplane mode
when a user checked the NFC state in settings page.

Fix it by removing NfcAirplaneModeObserver.
Keep the NFC state consistent.


Bug:128384879
Test: make RunSettingsRoboTests / Check Nfc on/off Status
Merged-In: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
Change-Id: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
2019-06-07 00:11:32 +00: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
Julia Reynolds
4c15fab99d Merge "Silent notifs appear on lockscreen by default" into qt-dev am: f58cd0fb51
am: df0fdaef74

Change-Id: Ibed0e690dab29c78a58f694b3edc9bf9cf67cf2d
2019-06-06 12:10:00 -07:00