Kevin Chang
89679608d7
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1
...
am: d09d7b078d0e1f39fad8
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: b2d8610c990e1f39fad8
2019-06-09 18:17:42 -07:00
Kevin Chang
d09d7b078d
Merge "Add tutorial dialog for gesture navigation" into qt-dev
...
am: 102d43b5c1
2019-06-09 18:12:44 -07:00
Kevin Chang
b2d8610c99
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev
...
am: 102d43b5c10e1f39fad8
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
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
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
2019-06-08 17:47:06 -07:00
Bill Yi
49cc947902
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: b567faffaa
2019-06-08 17:42:07 -07:00
Bill Yi
d4ac3ef39a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: b567faffaa
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2019-06-06 12:10:00 -07:00
Julia Reynolds
acee80f8fe
Merge "Silent notifs appear on lockscreen by default" into qt-dev am: f58cd0fb51
...
am: 520a48070f
2019-06-06 12:03:55 -07:00
Julia Reynolds
df0fdaef74
Merge "Silent notifs appear on lockscreen by default" into qt-dev
...
am: f58cd0fb51
2019-06-06 12:00:54 -07:00
Julia Reynolds
520a48070f
Merge "Silent notifs appear on lockscreen by default" into qt-dev
...
am: f58cd0fb51
2019-06-06 11:55:54 -07:00
Mehdi Alizadeh
769bcd2efc
Updates System Navigation strings am: 14a1b19735
...
am: 14d77491cf
2019-06-06 11:36:59 -07:00
TreeHugger Robot
f58cd0fb51
Merge "Silent notifs appear on lockscreen by default" into qt-dev
2019-06-06 18:36:57 +00:00
Mehdi Alizadeh
1781d93ff3
Updates System Navigation strings am: 14a1b19735
...
am: cde53dc119
2019-06-06 11:31:42 -07:00
Mehdi Alizadeh
cde53dc119
Updates System Navigation strings
...
am: 14a1b19735
2019-06-06 11:28:39 -07:00
Mehdi Alizadeh
14d77491cf
Updates System Navigation strings
...
am: 14a1b19735
2019-06-06 11:28:39 -07:00
