PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,703 Commits 1 Branch 0 Tags
dc67600f18d20a9743a4ffff47e65a38dea70bae
Commit Graph

53703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
dc67600f18 Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d am: 2d7cf1d924 
am: cde28793cd

Change-Id: I83e1cf3c191023b056c7f20e0f31577fd311e7ca
 2019-05-30 20:46:28 -07:00
Colin Cross
cde28793cd Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d 
am: 2d7cf1d924

Change-Id: I17cd8ae5326176f8451fd81af0d468326403a9ed
 2019-05-30 20:28:58 -07:00
Colin Cross
2d7cf1d924 Merge "Make test_options.timeout an int64" am: c56651b345 
am: 001b1c556d

Change-Id: I3ed30fbfadfd6c821bb7246d0abba19b9fb00ce6
 2019-05-30 20:24:25 -07:00
Colin Cross
001b1c556d Merge "Make test_options.timeout an int64" 
am: c56651b345

Change-Id: If57d4ce65e9e55e89c6e41376b1fa08447062666
 2019-05-30 20:19:07 -07:00
Colin Cross
c56651b345 Merge "Make test_options.timeout an int64" 2019-05-31 03:11:22 +00:00
TreeHugger Robot
46a221434b Merge "Fixed the IllegalStateException on removing account" 2019-05-31 03:04:48 +00:00
Ilya Matyukhin
803630c74b Merge "Add generateChallenge() in onResume()" into qt-r1-dev am: dbe399a023 
am: c6f766ec2b

Change-Id: Id1f442fbfbe8d2fe63a7fcb5b4e1bce5dfb7e7bc
 2019-05-30 18:15:06 -07:00
Ilya Matyukhin
c6f766ec2b Merge "Add generateChallenge() in onResume()" into qt-r1-dev 
am: dbe399a023

Change-Id: Ie6c6b6cb22ba783ee402e5c9fb0cae510c6f8fdf
 2019-05-30 18:10:09 -07:00
Bill Yi
f0b3101b24 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours am: 71edc54326 -s ours 
am: d31d5fca30 -s ours
am skip reason: subject contains skip directive

Change-Id: I68b6813309e1742ceb439f0ca223783791f46b0b
 2019-05-30 18:00:58 -07:00
Bill Yi
093c8e49a0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours am: f78ed7078e -s ours 
am: b7cc89cf2d -s ours
am skip reason: subject contains skip directive

Change-Id: I5e248c36376097e7399d6454c14f9c1e127c2160
 2019-05-30 17:56:08 -07:00
TreeHugger Robot
dbe399a023 Merge "Add generateChallenge() in onResume()" into qt-r1-dev 2019-05-31 00:52:11 +00:00
Bill Yi
d31d5fca30 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours 
am: 71edc54326 -s ours
am skip reason: subject contains skip directive

Change-Id: I1c6b00133e923a3244304e129869debba5f3f1b9
 2019-05-30 17:49:56 -07:00
Bill Yi
b7cc89cf2d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours 
am: f78ed7078e -s ours
am skip reason: subject contains skip directive

Change-Id: I02e30980ecd606b9e18dfe1f61af71e0c01706fa
 2019-05-30 17:47:52 -07:00
Bill Yi
71edc54326 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: d1ddb16617 -s ours
am skip reason: subject contains skip directive

Change-Id: I86d2ea6736d4765940832bd48b4d37a9bb5046b7
 2019-05-30 17:42:52 -07:00
Bill Yi
f78ed7078e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: d1ddb16617 -s ours
am skip reason: subject contains skip directive

Change-Id: Id0af6c3c08db79fbfa30f6c50f3e404d5011a9e5
 2019-05-30 17:38:37 -07:00
TreeHugger Robot
d1ddb16617 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-05-31 00:30:42 +00:00
Fan Zhang
5f2d7f841d Merge "Add slice uri to slice index db" 2019-05-31 00:02:25 +00:00
Joshua Mccloskey
be79914c4f Merge "String update." into qt-r1-dev am: b471e2439c 
am: 9b79a4c902

Change-Id: I310df214301362a841a37f8b8762a9bbae67d7d1
 2019-05-30 16:48:58 -07:00
Fan Zhang
f36ca50ec7 Add slice uri to slice index db 
And slightly refactored the SliceDataConverter to remove 1 reflection.

Bug: 126222433
Test: robotest
Change-Id: Ic5782bdd71f5c9cb77879a35de81dc61c01d1912
 2019-05-30 16:47:31 -07:00
Joshua Mccloskey
9b79a4c902 Merge "String update." into qt-r1-dev 
am: b471e2439c

Change-Id: I63a30632336f2df104440ed4e51c3d76d4f2aa9f
 2019-05-30 16:32:47 -07:00
Alex Salo
88e3adce68 Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev am: fa127bd6f7 
am: ac7851e1ce

Change-Id: Id621a398191568a76ed1e5bce00a63ad48a22f86
 2019-05-30 16:31:17 -07:00
Joshua Mccloskey
b471e2439c Merge "String update." into qt-r1-dev 2019-05-30 23:12:53 +00:00
Alex Salo
ac7851e1ce Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev 
am: fa127bd6f7

Change-Id: Ie61452dd21b1d3d6183edab66c01b51d39c008da
 2019-05-30 16:12:36 -07:00
Alex Salo
fa127bd6f7 Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev 2019-05-30 22:59:12 +00:00
Mehdi Alizadeh
77d4025099 Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f am: 5d77656d5d 
am: 6db3e8bf18

Change-Id: Ie66c72179ee3616ac2075d2a985050808f8f0380
 2019-05-30 15:38:44 -07:00
Mehdi Alizadeh
e1ad225a51 Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f am: 4937d4ca1f 
am: 97f5ab6fac

Change-Id: I634d14637d8d9be256b7efb85d63969cc1473eac
 2019-05-30 15:37:57 -07:00
Colin Cross
ab93f00e11 [automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660 am: 8ddf9e7e3f -s ours am: c1b598b218 -s ours 
am: 243ed56948 -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: I851b13ea1260eb67e615966c3af8d52644fbd14a
 2019-05-30 15:23:14 -07:00
Mehdi Alizadeh
6db3e8bf18 Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f 
am: 5d77656d5d

Change-Id: Ia6a3e930209d6c182f063ecc9c7fe786db73f7fb
 2019-05-30 15:20:20 -07:00
Mehdi Alizadeh
97f5ab6fac Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f 
am: 4937d4ca1f

Change-Id: Ib4f85a72db8e8d36e5016c90857c532195632904
 2019-05-30 15:19:22 -07:00
Bill Yi
bd1ab2754b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6da271a883e0a62cc5f32890c3411e64ef856fa7
 2019-05-30 15:17:06 -07:00
Mehdi Alizadeh
4937d4ca1f Merge "Increase char limit to 60 for string translation" into qt-dev 
am: 178d4a7f8f

Change-Id: I8369dc9dc525652253f4d5a8945725b09268470c
 2019-05-30 15:16:16 -07:00
Mehdi Alizadeh
5d77656d5d Merge "Increase char limit to 60 for string translation" into qt-dev 
am: 178d4a7f8f

Change-Id: Ia7882da10d3f323234267cbec3ea1136214fd974
 2019-05-30 15:14:15 -07:00
TreeHugger Robot
178d4a7f8f Merge "Increase char limit to 60 for string translation" into qt-dev 2019-05-30 22:04:47 +00:00
Ilya Matyukhin
d59150eca6 Add generateChallenge() in onResume() 
Fixes: 133498264
Fixes: 133440610
Test: open FaceSettings from Settings with and without an enrolled face
Test: open FaceSettings from the notification that asks to re-enroll
Change-Id: I80ca7644f96a538614962232fb3951d1a91d87c7
 2019-05-30 15:01:22 -07:00
Colin Cross
243ed56948 [automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660 am: 8ddf9e7e3f -s ours 
am: c1b598b218 -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: Id148a1ec77e363cc5e7f2cbe94adb172377107af
 2019-05-30 14:53:04 -07:00
Colin Cross
c1b598b218 [automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660 
am: 8ddf9e7e3f -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: I8e7fd2f64f6ccd6ba0f8ef2809a93322a46ac87a
 2019-05-30 14:45:35 -07:00
Julia Reynolds
37344f57b3 Merge "Change notification alert icon" into qt-dev am: 2821456995 am: 72182e1ffc 
am: cffcc4cb42

Change-Id: If297546cb7359b52ba2ea441dd116e317d00aa09
 2019-05-30 14:39:15 -07:00
Colin Cross
8ddf9e7e3f Merge "Convert Settings to Android.bp" 
am: 06dfd75660

Change-Id: Ie863baa7e286a44a8e13b4c5e162f4fecc57de74
 2019-05-30 14:37:45 -07:00
Julia Reynolds
42c33d0798 Merge "Change notification alert icon" into qt-dev am: 2821456995 am: f5afaffc2c 
am: 71420a2209

Change-Id: Ifffa09d63f2ff782b199eb4f9ddd065d079b16e6
 2019-05-30 14:33:38 -07:00
Julia Reynolds
cffcc4cb42 Merge "Change notification alert icon" into qt-dev am: 2821456995 
am: 72182e1ffc

Change-Id: I59f6af8e04981f9c0c3053f58d41b7461c1101b1
 2019-05-30 14:26:01 -07:00
Julia Reynolds
71420a2209 Merge "Change notification alert icon" into qt-dev am: 2821456995 
am: f5afaffc2c

Change-Id: I340a6394fece9fe398e92c219b3a186db341001c
 2019-05-30 14:22:17 -07:00
Christine Franks
6f77114944 Merge "Add SIM color picker" into qt-dev am: b747c5c270 am: 02c4e123b7 
am: d28539d045

Change-Id: I380b2c60027f12f8abcb6d9a3d0696c3c2c0019f
 2019-05-30 14:14:37 -07:00
Julia Reynolds
72182e1ffc Merge "Change notification alert icon" into qt-dev 
am: 2821456995

Change-Id: I7b38e88e702ce91162f29592c69dcc4f8612181d
 2019-05-30 14:11:52 -07:00
Christine Franks
2adf1f213d Merge "Add SIM color picker" into qt-dev am: b747c5c270 am: c1c4a0858d 
am: 3ccc01ca18

Change-Id: I0e2c4d96df27e71d11b8a092f2cf86733d29727b
 2019-05-30 14:09:41 -07:00
Julia Reynolds
f5afaffc2c Merge "Change notification alert icon" into qt-dev 
am: 2821456995

Change-Id: I5877100513be3b2e17d6074bedc5237fcf5ac772
 2019-05-30 14:08:51 -07:00
Colin Cross
06dfd75660 Merge "Convert Settings to Android.bp" 2019-05-30 21:08:37 +00:00
TreeHugger Robot
2821456995 Merge "Change notification alert icon" into qt-dev 2019-05-30 20:51:49 +00:00
Christine Franks
d28539d045 Merge "Add SIM color picker" into qt-dev am: b747c5c270 
am: 02c4e123b7

Change-Id: I1f37ffa348b5330d17a1aad5caff94d12136f9e9
 2019-05-30 13:48:43 -07:00
Christine Franks
3ccc01ca18 Merge "Add SIM color picker" into qt-dev am: b747c5c270 
am: c1c4a0858d

Change-Id: I0c4ac5abe7be3eeb2df324b41f13284ed25dea95
 2019-05-30 13:35:49 -07:00
Christine Franks
02c4e123b7 Merge "Add SIM color picker" into qt-dev 
am: b747c5c270

Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
 2019-05-30 13:26:55 -07:00