Commit Graph

52689 Commits

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

Change-Id: I2744ff72f969d635eff1b4b00d710e86ed61569d
2019-06-11 14:42:45 -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
bf784da3ba Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
am: 5d186f5346

Change-Id: If5d9e121d1258f94446dd22c8ba6421bf4f83c70
2019-06-11 13:19:50 -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
0c2b7c4281 Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
am: 9fb76d02bb

Change-Id: I4f128a5f04212531a6e0b81660c0a80d86af4cc1
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
1096299433 Fix overlapping problem on notification screen am: 564fcb90ab
am: a5715f7d9c

Change-Id: I15dee21bbd03123c4b1c6f22eee989b328f69d31
2019-06-11 10:54:26 -07:00
tmfang
a5715f7d9c Fix overlapping problem on notification screen
am: 564fcb90ab

Change-Id: I4843fe2b835b5487695ccb522848127028042d4c
2019-06-11 10:46:32 -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
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
5904e176c6 Merge "Hide color mode in search during A11y" into qt-r1-dev
am: 9eaf5de974

Change-Id: I9083850a67fa096f77abaf0e3bea5336cb41c65e
2019-06-10 17:32:13 -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
Kevin Chang
b295e7abed Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1
am: d09d7b078d

Change-Id: I81da5d0cb5f7e302f098d07155c9af2533d73a13
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
102d43b5c1 Merge "Add tutorial dialog for gesture navigation" into qt-dev 2019-06-10 00:57:14 +00:00
TreeHugger Robot
c9930505be Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev 2019-06-09 03:02:37 +00:00
Bill Yi
8ef323524e [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: Icf20feed5e44f7ce74165ece7ef54112f30e1e3b
2019-06-08 19:37:17 -07:00
TreeHugger Robot
af6b60c523 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-09 02:29:19 +00:00
Bill Yi
d1b2954cff [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: Ibb2b9359cd7b6efed2b383c157acf7d33823200f
2019-06-08 17:47:06 -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
73923ec0e7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I805ccf4d38fa75c5c0c9e9ce538bf48f7db23dda
2019-06-08 12:50:40 -07: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
Lorenzo Colitti
c1d37805fc Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21
am: 090cd1d05e

Change-Id: Id86251bdd22b0d47a418e6a5c11af9c2b44e1714
2019-06-07 23:56:31 -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
41e92a1e6c Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d
am: ee6cc56b68

Change-Id: Icb00ba2da2a729852f81c3cdfad14c2a8732b233
2019-06-07 21:11:07 -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
1221604283 Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
am: 7b5d1016f4

Change-Id: I26137eb5938d13ae11990c97a4ab70ad0b45972d
2019-06-07 16:02:22 -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
ab5543410b Merge "Updating colors for dark theme" into qt-r1-dev
am: 6d24819758

Change-Id: If4e7a8c0371b38d9e93afad52d669ca1ca3cdfd4
2019-06-07 12:32:24 -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
George Chang
8c6c0043bc Fix NFC state switched off every time user entered connection preferences page am: e4c2e427a1
am: dc29b325a1

Change-Id: I6a6b68aaaf57a411e14f16ddd56a8f8accb650bb
2019-06-06 23:34: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
6ab71397c6 Merge "Fix screen attention contextual card" into qt-r1-dev
am: 03c47e7687

Change-Id: Icc1b98c78c0e087743c000bb423f1ee7f1522eab
2019-06-06 13:23:34 -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
e485af3e8e Merge "Silent notifs appear on lockscreen by default" into qt-dev am: f58cd0fb51
am: df0fdaef74

Change-Id: I44437c62927fbe5ef3f23258bcc0aea8af4210a5
2019-06-06 12:08:56 -07:00
Julia Reynolds
df0fdaef74 Merge "Silent notifs appear on lockscreen by default" into qt-dev
am: f58cd0fb51

Change-Id: I39f53bcf9665291fb3961e7358aec09e60a310e7
2019-06-06 12:00:54 -07:00
TreeHugger Robot
f58cd0fb51 Merge "Silent notifs appear on lockscreen by default" into qt-dev 2019-06-06 18:36:57 +00:00