PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,447 Commits 1 Branch 0 Tags
c15fd54810bc1a31d0fbb646d9309c4886e1c00c
Commit Graph

54447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan Zhang
13cf250be5 Remove "platform_slice" attribute from Settings. 
Bug: 126222433
Test: robo
Change-Id: I05beec7d3e3ec713c40740a1adbcacaee88237b5
 2019-06-10 14:05:43 -07:00
Kevin Chang
8af10e6da7 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
 2019-06-09 18:23:13 -07:00
Kevin Chang
e92c0b1804 [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
 2019-06-09 18:22:45 -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
9c2bad63ae [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
 2019-06-08 19:43:19 -07: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
TreeHugger Robot
82d594c53c Merge "Import translations. DO NOT MERGE" 2019-06-09 01:06:25 +00:00
Bill Yi
74d401c482 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
 2019-06-08 17:52:31 -07:00
Bill Yi
4c3d0e1c03 [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
 2019-06-08 17:52:08 -07: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
Bill Yi
2abdf5319c Import translations. DO NOT MERGE 
Change-Id: Id2375b4bbdad6ab78fd8986fe5cc78d5fa697de7
Auto-generated-cl: translation import
 2019-06-08 11:37:49 -07:00
Lorenzo Colitti
fb3000a5c8 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
 2019-06-08 00:01:57 -07:00
Lorenzo Colitti
a1568c49d4 Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21 am: 4bee989ec1 
am: 37bf2c4591

Change-Id: I6213316de4d3de257898f2ac23ee321aa8a24afb
 2019-06-08 00:01:33 -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
186d3d2d96 Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d am: 4c4bad8e67 
am: 89dac52532

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

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

Change-Id: I7a1c016807c1592813706cc6bd9aacd0777c70d0
 2019-06-07 16:10:29 -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
71c09bab34 Merge "Updating colors for dark theme" into qt-r1-dev am: 6d24819758 
am: df8ef0d9bb

Change-Id: Id084a2f9d2b75eea18df67ede8a55545fdc9480f
 2019-06-07 12:32:31 -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
George Chang
6a3edccf8e [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
 2019-06-06 23:39:38 -07:00
George Chang
9db2e72911 [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
 2019-06-06 23:39:10 -07: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