OSDN Git Service
Kevin Chang [Mon, 10 Jun 2019 01:23:13 +0000 (18:23 -0700)]
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
Kevin Chang [Mon, 10 Jun 2019 01:22:45 +0000 (18:22 -0700)]
[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
Android Build Merger (Role) [Mon, 10 Jun 2019 01:17:55 +0000 (01:17 +0000)]
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
Kevin Chang [Mon, 10 Jun 2019 01:17:43 +0000 (18:17 -0700)]
[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
Kevin Chang [Mon, 10 Jun 2019 01:17:42 +0000 (18:17 -0700)]
[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
Kevin Chang [Mon, 10 Jun 2019 01:12:44 +0000 (18:12 -0700)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev
am:
102d43b5c1
Change-Id: I12f498a313f5920940d49553f0c11c5619a7a4eb
Kevin Chang [Mon, 10 Jun 2019 01:12:42 +0000 (18:12 -0700)]
[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
Kevin Chang [Mon, 10 Jun 2019 00:57:14 +0000 (00:57 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev
Bill Yi [Sun, 9 Jun 2019 02:43:19 +0000 (19:43 -0700)]
[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
Bill Yi [Sun, 9 Jun 2019 02:37:18 +0000 (19:37 -0700)]
[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
TreeHugger Robot [Sun, 9 Jun 2019 02:29:19 +0000 (02:29 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
TreeHugger Robot [Sun, 9 Jun 2019 01:06:25 +0000 (01:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sun, 9 Jun 2019 00:52:31 +0000 (17:52 -0700)]
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
Bill Yi [Sun, 9 Jun 2019 00:52:08 +0000 (17:52 -0700)]
[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
Android Build Merger (Role) [Sun, 9 Jun 2019 00:47:23 +0000 (00:47 +0000)]
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
Bill Yi [Sun, 9 Jun 2019 00:47:07 +0000 (17:47 -0700)]
[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
Bill Yi [Sun, 9 Jun 2019 00:47:06 +0000 (17:47 -0700)]
[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
Bill Yi [Sun, 9 Jun 2019 00:42:07 +0000 (17:42 -0700)]
[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
Bill Yi [Sun, 9 Jun 2019 00:42:07 +0000 (17:42 -0700)]
[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
TreeHugger Robot [Sun, 9 Jun 2019 00:31:00 +0000 (00:31 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sat, 8 Jun 2019 19:26:23 +0000 (12:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7b9956f00ad7c2e77e75dddb64a3ee70cc72fa78
Bill Yi [Sat, 8 Jun 2019 19:01:55 +0000 (12:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If595c532cf6a8e9724c74c96b29356ab1bdb65b0
Bill Yi [Sat, 8 Jun 2019 18:37:49 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2375b4bbdad6ab78fd8986fe5cc78d5fa697de7
Auto-generated-cl: translation import
Lorenzo Colitti [Sat, 8 Jun 2019 07:01:57 +0000 (00:01 -0700)]
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
Lorenzo Colitti [Sat, 8 Jun 2019 07:01:33 +0000 (00:01 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am:
2bcfecdb21 am:
4bee989ec1
am:
37bf2c4591
Change-Id: I6213316de4d3de257898f2ac23ee321aa8a24afb
Android Build Merger (Role) [Sat, 8 Jun 2019 06:56:45 +0000 (06:56 +0000)]
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
Lorenzo Colitti [Sat, 8 Jun 2019 06:56:32 +0000 (23:56 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am:
2bcfecdb21
am:
090cd1d05e
Change-Id: I93cb100fcbda15dfd0eba3dff2be301bc26948f3
Lorenzo Colitti [Sat, 8 Jun 2019 06:56:31 +0000 (23:56 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am:
2bcfecdb21
am:
4bee989ec1
Change-Id: Iaaf336ee2d88654bc46fc3caaf5595f651c8f9ba
Lorenzo Colitti [Sat, 8 Jun 2019 06:51:32 +0000 (23:51 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am:
2bcfecdb21
Change-Id: I556ca5d18af9ea673216d63bef71ee9ca66d66ad
Lorenzo Colitti [Sat, 8 Jun 2019 06:51:32 +0000 (23:51 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am:
2bcfecdb21
Change-Id: I1108a0f097e7f6b1fc47f2551f18e6316688a8f9
TreeHugger Robot [Sat, 8 Jun 2019 06:41:11 +0000 (06:41 +0000)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
Kevin Chyn [Sat, 8 Jun 2019 04:17:02 +0000 (21:17 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller am:
eeecb3e24d am:
4c4bad8e67
am:
89dac52532
Change-Id: Id871de1d6522553d867320827771c0b7576b1f93
Kevin Chyn [Sat, 8 Jun 2019 04:16:40 +0000 (21:16 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller am:
eeecb3e24d am:
ee6cc56b68
am:
482751b66e
Change-Id: I0e010636e162c277e28548005310bc81636baf56
Kevin Chyn [Sat, 8 Jun 2019 04:12:07 +0000 (21:12 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller am:
eeecb3e24d
am:
4c4bad8e67
Change-Id: I0a3eda6c744c699af850a48e19180967558113b4
Kevin Chyn [Sat, 8 Jun 2019 04:11:43 +0000 (21:11 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller am:
eeecb3e24d
am:
ee6cc56b68
Change-Id: Id0d8da3ec154b635a89799e106e2c8183aa1cba4
Kevin Chyn [Sat, 8 Jun 2019 04:07:07 +0000 (21:07 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
am:
eeecb3e24d
Change-Id: I4d38ec9a0ffa4dbcffee9b5b7e31c20fd5bd3c7b
Kevin Chyn [Sat, 8 Jun 2019 04:06:08 +0000 (21:06 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
am:
eeecb3e24d
Change-Id: I16becf1de78463e9379291f6273c963e850d4687
Kevin Chyn [Fri, 7 Jun 2019 23:10:29 +0000 (16:10 -0700)]
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev am:
7b5d1016f4
am:
a53cf34f7e
Change-Id: I7a1c016807c1592813706cc6bd9aacd0777c70d0
Kevin Chyn [Fri, 7 Jun 2019 23:04:05 +0000 (16:04 -0700)]
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
am:
7b5d1016f4
Change-Id: Idfc11df50ece3e3553fe6e45715716305c1b06e7
Kevin Chyn [Fri, 7 Jun 2019 22:44:49 +0000 (22:44 +0000)]
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
Kevin Chyn [Fri, 7 Jun 2019 22:13:29 +0000 (15:13 -0700)]
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
Kevin Chyn [Fri, 7 Jun 2019 19:41:05 +0000 (12:41 -0700)]
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
Joshua Mccloskey [Fri, 7 Jun 2019 19:32:31 +0000 (12:32 -0700)]
Merge "Updating colors for dark theme" into qt-r1-dev am:
6d24819758
am:
df8ef0d9bb
Change-Id: Id084a2f9d2b75eea18df67ede8a55545fdc9480f
Joshua Mccloskey [Fri, 7 Jun 2019 19:28:31 +0000 (12:28 -0700)]
Merge "Updating colors for dark theme" into qt-r1-dev
am:
6d24819758
Change-Id: Icde71ef65279e29bf64c0005e29e9db004550054
Joshua Mccloskey [Fri, 7 Jun 2019 19:15:11 +0000 (19:15 +0000)]
Merge "Updating colors for dark theme" into qt-r1-dev
Lorenzo Colitti [Fri, 7 Jun 2019 06:18:21 +0000 (15:18 +0900)]
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
George Chang [Fri, 7 Jun 2019 06:39:38 +0000 (23:39 -0700)]
[automerger skipped] Merge "Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1 am:
dc29b325a1" into qt-r1-dev-plus-aosp
am:
771b5468b9 -s ours
am skip reason: change_id If4c8e47c2509b09e8bc1a464e1ab329b945e3d20 with SHA1
6ddff97414 is in history
Change-Id: I8b4127787401f6d5d9384021f7e78da2c173a6ee
George Chang [Fri, 7 Jun 2019 06:39:10 +0000 (23:39 -0700)]
[automerger skipped] Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1 am:
dc6a11a82a
am:
ee0740c4d6 -s ours
am skip reason: change_id If4c8e47c2509b09e8bc1a464e1ab329b945e3d20 with SHA1
6ddff97414 is in history
Change-Id: I7315d98a6c905e915611d95364215bdc2341b4e4
Android Build Merger (Role) [Fri, 7 Jun 2019 06:34:22 +0000 (06:34 +0000)]
Merge "Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1 am:
dc29b325a1" into qt-r1-dev-plus-aosp
George Chang [Fri, 7 Jun 2019 06:34:09 +0000 (23:34 -0700)]
Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1
am:
dc29b325a1
Change-Id: I8a8ce7b773a0c5fa6ead761f288263fe7133ac1c
George Chang [Fri, 7 Jun 2019 06:34:07 +0000 (23:34 -0700)]
Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1
am:
dc6a11a82a
Change-Id: Iccc2bcf6c1bec2b2ff9b3aa096ff1fb8c155f03b
George Chang [Fri, 7 Jun 2019 06:29:07 +0000 (23:29 -0700)]
Fix NFC state switched off every time user entered connection preferences page
am:
e4c2e427a1
Change-Id: If4545377b7c6196027b89514a91a2b7068f1202b
George Chang [Fri, 7 Jun 2019 06:29:07 +0000 (23:29 -0700)]
Fix NFC state switched off every time user entered connection preferences page
am:
e4c2e427a1
Change-Id: I52186dbe7b550fd6ab2ae0bccdba80ac1e779b1f
George Chang [Thu, 30 May 2019 10:23:18 +0000 (18:23 +0800)]
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
George Chang [Fri, 7 Jun 2019 00:09:46 +0000 (00:09 +0000)]
Merge "Fix NFC state switched off every time user entered connection preferences page"
joshmccloskey [Thu, 6 Jun 2019 23:13:59 +0000 (16:13 -0700)]
Updating colors for dark theme
Bug:
133277663
Test: Verified colors are correct for dark & light themes.
Change-Id: If1aa5f22286d15918cfec3cd4a6436760bf304b2
Yi Jiang [Thu, 6 Jun 2019 20:27:54 +0000 (13:27 -0700)]
Merge "Fix screen attention contextual card" into qt-r1-dev am:
03c47e7687
am:
02777d3e1b
Change-Id: I5acfcf2d99d1e5652cce1d552aa28b7369f8f516
Yi Jiang [Thu, 6 Jun 2019 20:23:32 +0000 (13:23 -0700)]
Merge "Fix screen attention contextual card" into qt-r1-dev
am:
03c47e7687
Change-Id: Ic7a425c3662d834da23629d9fd98dc5fc39e4ccc
Yi Jiang [Thu, 6 Jun 2019 20:06:21 +0000 (20:06 +0000)]
Merge "Fix screen attention contextual card" into qt-r1-dev
Julia Reynolds [Thu, 6 Jun 2019 19:19:15 +0000 (12:19 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am:
f58cd0fb51 am:
df0fdaef74
am:
4c15fab99d
Change-Id: I0f38ea55a246e19bac8b46851fc9763fb56c811e
Julia Reynolds [Thu, 6 Jun 2019 19:10:00 +0000 (12:10 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am:
f58cd0fb51
am:
df0fdaef74
Change-Id: Ibed0e690dab29c78a58f694b3edc9bf9cf67cf2d
Julia Reynolds [Thu, 6 Jun 2019 19:09:23 +0000 (12:09 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am:
f58cd0fb51 am:
520a48070f
am:
acee80f8fe
Change-Id: I97ee10e986b760593aaa5da43932be82c400aa74
Julia Reynolds [Thu, 6 Jun 2019 19:03:55 +0000 (12:03 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am:
f58cd0fb51
am:
520a48070f
Change-Id: I66b0830dc86ee78e97541be0e4ab412eeb2457e5
Julia Reynolds [Thu, 6 Jun 2019 19:00:54 +0000 (12:00 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
am:
f58cd0fb51
Change-Id: I39f53bcf9665291fb3961e7358aec09e60a310e7
Julia Reynolds [Thu, 6 Jun 2019 18:55:54 +0000 (11:55 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
am:
f58cd0fb51
Change-Id: I446708aba61c268375257280341a1ff5b33aa81d
Mehdi Alizadeh [Thu, 6 Jun 2019 18:51:20 +0000 (11:51 -0700)]
Updates System Navigation strings am:
14a1b19735 am:
14d77491cf
am:
769bcd2efc
Change-Id: I4aa62c5fc337b238cca13bc66c40feebd1db3432
Mehdi Alizadeh [Thu, 6 Jun 2019 18:45:57 +0000 (11:45 -0700)]
Updates System Navigation strings am:
14a1b19735 am:
cde53dc119
am:
1781d93ff3
Change-Id: If0d11e3a7ae19681a9c986e2393c677934ce9527
Mehdi Alizadeh [Thu, 6 Jun 2019 18:36:59 +0000 (11:36 -0700)]
Updates System Navigation strings am:
14a1b19735
am:
14d77491cf
Change-Id: Ifcfaaf9d57b8ee2c19c4a5a891240522457495af
TreeHugger Robot [Thu, 6 Jun 2019 18:36:57 +0000 (18:36 +0000)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
Mehdi Alizadeh [Thu, 6 Jun 2019 18:31:42 +0000 (11:31 -0700)]
Updates System Navigation strings am:
14a1b19735
am:
cde53dc119
Change-Id: Id431c8e6b12611b00af1b3e34ad7b66deddc49fa
Mehdi Alizadeh [Thu, 6 Jun 2019 18:28:39 +0000 (11:28 -0700)]
Updates System Navigation strings
am:
14a1b19735
Change-Id: Ifd443b394ce19ceb0c0fe94abbaaa31d9158c475
Mehdi Alizadeh [Thu, 6 Jun 2019 18:28:39 +0000 (11:28 -0700)]
Updates System Navigation strings
am:
14a1b19735
Change-Id: I86d6eab41c4c5d04d4311ce7699f55546f29cebf
Mehdi Alizadeh [Wed, 5 Jun 2019 22:34:50 +0000 (15:34 -0700)]
Updates System Navigation strings
Bug:
134517326
Test: Verified manually
Change-Id: I777cfdc3a760040fdea745c5247152c5ff0d6218
George Chang [Thu, 30 May 2019 10:23:18 +0000 (18:23 +0800)]
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
Change-Id: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
Julia Reynolds [Thu, 6 Jun 2019 15:18:24 +0000 (11:18 -0400)]
Silent notifs appear on lockscreen by default
Test: atest
Bug:
134613164
Change-Id: I1ee39a1302010a2a29ba6d0060f19565e41859a2
Kevin Chang [Thu, 6 Jun 2019 09:22:26 +0000 (02:22 -0700)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp am:
52482edb2b
am:
abee9d52e4
Change-Id: I91e8fb09ae80638f678408a7a19da58830473667
Kevin Chang [Thu, 6 Jun 2019 09:17:06 +0000 (02:17 -0700)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
am:
52482edb2b
Change-Id: Ifecf327f3cd13efe708e99c697afd44b13e24f74
Kevin Chang [Thu, 6 Jun 2019 09:04:42 +0000 (09:04 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
Kevin Chang [Fri, 31 May 2019 07:14:47 +0000 (15:14 +0800)]
Add tutorial dialog for gesture navigation
Add new tutorial dialog for gesture navigation in order to teach
users how to use the gesture
Fixes:
133650388
Test: Manual
Change-Id: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
Merged-In: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
TreeHugger Robot [Thu, 6 Jun 2019 06:03:14 +0000 (06:03 +0000)]
Merge "Update OWNERS file"
Kevin Chang [Fri, 31 May 2019 07:14:47 +0000 (15:14 +0800)]
Add tutorial dialog for gesture navigation
Add new tutorial dialog for gesture navigation in order to teach
users how to use the gesture
Fixes:
133650388
Test: Manual
Change-Id: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
Andy Chou [Thu, 6 Jun 2019 03:49:13 +0000 (20:49 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am:
a9e8c50764 am:
768691520b
am:
bbd66147eb
Change-Id: I9792ffeb47e15e43f3b6b5cfe3d28a1b5e5cefe4
Antony Sargent [Thu, 6 Jun 2019 03:48:46 +0000 (20:48 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev am:
68a26e5535 am:
2082b0e969
am:
1eccc3fff3
Change-Id: I1e6818bcd80d2e904aa085b4f27ae0434d64ed26
Andy Chou [Thu, 6 Jun 2019 03:46:46 +0000 (20:46 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am:
a9e8c50764 am:
8c0d669d6e
am:
3d43db4e50
Change-Id: Icd7d4f913c47a25278d85098a84a9e789191d3b2
Antony Sargent [Thu, 6 Jun 2019 03:44:33 +0000 (20:44 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev am:
68a26e5535 am:
5cdf1955f4
am:
74401c6716
Change-Id: I21b01ce978f349887f9181c840eae3a71f2c9999
Yi Jiang [Thu, 6 Jun 2019 03:40:29 +0000 (20:40 -0700)]
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev am:
d81e2c36f6
am:
b7098b181f
Change-Id: I6cbea478176361733957adb06e63f1e9b58f1c8b
Andy Chou [Thu, 6 Jun 2019 03:29:10 +0000 (20:29 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am:
a9e8c50764
am:
768691520b
Change-Id: Ic357a10b7eec9dd65562138af37be35e1d4b0c01
Antony Sargent [Thu, 6 Jun 2019 03:28:05 +0000 (20:28 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev am:
68a26e5535
am:
2082b0e969
Change-Id: I2e61bb379571c03b900734ad5da03b33e2ddbc90
Andy Chou [Thu, 6 Jun 2019 03:27:25 +0000 (20:27 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am:
a9e8c50764
am:
8c0d669d6e
Change-Id: I5ff88b4ba6ff4a642834a3453438489ae2804dc2
Antony Sargent [Thu, 6 Jun 2019 03:27:01 +0000 (20:27 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev am:
68a26e5535
am:
5cdf1955f4
Change-Id: I88335b8bb5cf4ac4bc4d279679d36dbd2194346f
Andy Chou [Thu, 6 Jun 2019 02:51:46 +0000 (19:51 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am:
a9e8c50764
Change-Id: I7e32848cd240b43e93533f5575202b1122620dee
Antony Sargent [Thu, 6 Jun 2019 02:51:13 +0000 (19:51 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
am:
68a26e5535
Change-Id: I1ab73ba3e6e666a42590030d9dd6903f257b070a
Andy Chou [Thu, 6 Jun 2019 02:49:12 +0000 (19:49 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am:
a9e8c50764
Change-Id: I8d6b2b025fd039202eca5f6c8eefea1acb8f0e91
Antony Sargent [Thu, 6 Jun 2019 02:47:52 +0000 (19:47 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
am:
68a26e5535
Change-Id: I4d43b9a27284cf126c21ae7ab9089d2d79c0dc25
Andy Chou [Thu, 6 Jun 2019 00:35:16 +0000 (00:35 +0000)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
Antony Sargent [Thu, 6 Jun 2019 00:19:16 +0000 (00:19 +0000)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
Yi Jiang [Thu, 6 Jun 2019 00:10:30 +0000 (17:10 -0700)]
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
am:
d81e2c36f6
Change-Id: I34f211f8234fe883c1a646bd27f5d73ca0067463
Julia Reynolds [Wed, 5 Jun 2019 23:57:32 +0000 (16:57 -0700)]
Merge "Read the subtext of notif importance field on selection" into qt-dev am:
3f95fda1cf am:
559a72e27f
am:
6f0097e473
Change-Id: I2e017a0ce529907dcf2c80d1d69f2d4688d7c469
Suprabh Shukla [Wed, 5 Jun 2019 23:55:02 +0000 (16:55 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied am:
732edc3e39 am:
d879318434
am:
08ec3323c6
Change-Id: Ic54fc5079a92077424760c4c42b01a9d9c0c69e9
Anthony Han [Wed, 5 Jun 2019 23:51:22 +0000 (16:51 -0700)]
Merge "Hide color mode when unavailable" into qt-r1-dev am:
3472188437
am:
04749dce13
Change-Id: Ifd067bf50fec2df7b13aecdfe57c4a26fb15d25f