PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,774 Commits 1 Branch 0 Tags
0b32437916d33610fce0bd738a2db774dc17059c
Commit Graph

62774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mady Mellor
78865ad381 Merge "String updates" into rvc-dev am: 159538d35a am: e929e69810 am: 18d11571a9 am: 296025b6db 
Change-Id: If1e9bae914ee4e18098a9bbd8157f1532598b51f
 2020-03-23 16:45:30 +00:00
Mady Mellor
25c3c680a5 Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: e07e3b53c8 am: a1c1b3095c 
Change-Id: Ie32b888ad8c971170583febf4cd46158dd4b8087
 2020-03-23 16:45:17 +00:00
TreeHugger Robot
43d9013aaa Merge "Redesign individual conversation page" into rvc-dev 2020-03-23 16:31:27 +00:00
Mady Mellor
296025b6db Merge "String updates" into rvc-dev am: 159538d35a am: e929e69810 am: 18d11571a9 
Change-Id: If2f523a48628ec78e40336b285e3c94bdf6d8638
 2020-03-23 16:30:25 +00:00
Mady Mellor
415f8b549f Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: 2c59efa1b9 
Change-Id: I74591ad7a1d0ee9a0feec994c4033055dcfebe98
 2020-03-23 16:30:18 +00:00
Mady Mellor
a1c1b3095c Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: e07e3b53c8 
Change-Id: I59db11d7a282b516c2169970f60f412dced87104
 2020-03-23 16:30:18 +00:00
Mady Mellor
18d11571a9 Merge "String updates" into rvc-dev am: 159538d35a am: e929e69810 
Change-Id: I8d272867527271f5c0aa54c42fd6f086c7fdbc7c
 2020-03-23 16:23:24 +00:00
Mady Mellor
2c59efa1b9 Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 
Change-Id: I1c71776e55bbc485f075431ff45b5a57fbafd923
 2020-03-23 16:23:13 +00:00
Mady Mellor
e07e3b53c8 Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 
Change-Id: I66cd7c18b0683a5d39da602036be36a7c55fdca1
 2020-03-23 16:22:45 +00:00
Mady Mellor
9559e7d480 Merge "String updates" into rvc-dev am: 159538d35a 
Change-Id: I267fb8f17a5356c181f1943bef1dc17ffadda650
 2020-03-23 16:08:05 +00:00
Mady Mellor
e929e69810 Merge "String updates" into rvc-dev am: 159538d35a 
Change-Id: I83b0cecb2b975068a6ff5afe6f06114146dc923c
 2020-03-23 16:08:01 +00:00
Mady Mellor
159538d35a Merge "String updates" into rvc-dev 2020-03-23 15:43:29 +00:00
TreeHugger Robot
46dc92772c [automerger skipped] Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: fae0dc47f8 am: ac27493f40 am: b77dc4a6a0 -s ours am: 0d9931b186 -s ours 
am skip reason: Change-Id I9c23c558a9d764702e966d22e5c6e5c5425e4d32 with SHA-1 509273cc03 is in history

Change-Id: Iafac66a113888f344b17ae9fd4dbad7b8d48e981
 2020-03-23 15:31:56 +00:00
TreeHugger Robot
0d9931b186 [automerger skipped] Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: fae0dc47f8 am: ac27493f40 am: b77dc4a6a0 -s ours 
am skip reason: Change-Id I9c23c558a9d764702e966d22e5c6e5c5425e4d32 with SHA-1 509273cc03 is in history

Change-Id: Ifb943c234b57648cf82fea022d073aa8446e4047
 2020-03-23 15:22:40 +00:00
TreeHugger Robot
13ec98d6c9 [automerger skipped] Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: 6f1ebe6d79 -s ours am: 5b9371950b -s ours am: 239349186a -s ours 
am skip reason: Change-Id I9c23c558a9d764702e966d22e5c6e5c5425e4d32 with SHA-1 509273cc03 is in history

Change-Id: Ie725d2bc4d5985930c3c024a4325142bc4dca184
 2020-03-23 15:22:29 +00:00
TreeHugger Robot
59d0ad95be [automerger skipped] Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: fae0dc47f8 am: 236330ac81 am: 11a1580292 -s ours 
am skip reason: Change-Id I9c23c558a9d764702e966d22e5c6e5c5425e4d32 with SHA-1 5cfb5aa52d is in history

Change-Id: I55e369b534a640dd6581a97f1cb0458772177fea
 2020-03-23 15:22:08 +00:00
TreeHugger Robot
239349186a [automerger skipped] Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: 6f1ebe6d79 -s ours am: 5b9371950b -s ours 
am skip reason: Change-Id I9c23c558a9d764702e966d22e5c6e5c5425e4d32 with SHA-1 509273cc03 is in history

Change-Id: I5f4527c3350062dab8f6311302a593d8c16fc937
 2020-03-23 15:08:24 +00:00
TreeHugger Robot
b77dc4a6a0 Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: fae0dc47f8 am: ac27493f40 
Change-Id: I3a492eb7e2aa4582ea3bcd6d722782f78e52eb23
 2020-03-23 15:07:53 +00:00
TreeHugger Robot
11a1580292 Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: fae0dc47f8 am: 236330ac81 
Change-Id: I0daaa11d34d6abe9eeddd48e6f07f864ae42e1a0
 2020-03-23 15:07:30 +00:00
TreeHugger Robot
5b9371950b [automerger skipped] Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: 6f1ebe6d79 -s ours 
am skip reason: Change-Id I9c23c558a9d764702e966d22e5c6e5c5425e4d32 with SHA-1 509273cc03 is in history

Change-Id: I628e6eae987ff3998ba4769e25acd034a983e88a
 2020-03-23 14:50:00 +00:00
TreeHugger Robot
ac27493f40 Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: fae0dc47f8 
Change-Id: I781349e0b784ad51b6984a1f6e0027df0d1d1c18
 2020-03-23 14:49:56 +00:00
TreeHugger Robot
236330ac81 Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: fae0dc47f8 
Change-Id: I9a5e16d435a3455ac30d54ccdafb430bd388f4d7
 2020-03-23 14:49:22 +00:00
Ben Murdoch
7803f907c7 Move strings related to user creation to SettingsLib. 
Test: Build, manually check device.
Bug: 147653252
Bug: 152038380
Change-Id: I921d7907eca5c6bd6585f89e5dd5b6b6222bc745
 2020-03-23 14:23:23 +00:00
TreeHugger Robot
6f1ebe6d79 Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 
Change-Id: I40f114a95b899c28f41ca1f899f0760297eb7953
 2020-03-23 14:21:30 +00:00
TreeHugger Robot
fae0dc47f8 Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 
Change-Id: I227b803e7758ce75aca409e17ab2cfd6992accc3
 2020-03-23 14:19:48 +00:00
TreeHugger Robot
4d4c55ad72 Merge "Updates main page for Do Not Disturb" into rvc-dev 2020-03-23 14:01:46 +00:00
Fabian Kozynski
03b66becf6 Add strings for power menu settings 
Test: build
Bug: 152053344
Change-Id: I601037113a3191b814c5f65647fe0e520d9081ad
 2020-03-23 09:53:19 -04:00
TreeHugger Robot
3454ac6d33 Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: b0692bd6c5 am: 991990da36 am: dc332c4e4d am: cfd2e764d1 
Change-Id: I48855db19ba7241923bf0e033a5558f1654b3e77
 2020-03-23 12:07:57 +00:00
TreeHugger Robot
cfd2e764d1 Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: b0692bd6c5 am: 991990da36 am: dc332c4e4d 
Change-Id: Iea643b5fc8f9390131d441b2173af75c28cc9139
 2020-03-23 11:57:21 +00:00
TreeHugger Robot
36abda7027 Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: b0692bd6c5 am: 3f991e0778 am: 725e2118cc 
Change-Id: I389b1516303681ab47c5045d4105bce8ce90832e
 2020-03-23 11:53:15 +00:00
TreeHugger Robot
221f0c9450 Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: 4a4190dc9d am: c2cd9cc5cd am: 17d22b0c3a 
Change-Id: Ie3bf838464bec5c1ded36a99c6cd28c26430b1e0
 2020-03-23 11:52:50 +00:00
Raff Tsai
f7ade29151 Merge "Modify close app function." am: ce1f51128b am: 579878afcf am: ffe91b44f8 am: cf990c239e am: 8543472a19 
Change-Id: Idc543fb7f23f46391fbb54a681f8bac62178cd7a
 2020-03-23 11:52:11 +00:00
TreeHugger Robot
dc332c4e4d Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: b0692bd6c5 am: 991990da36 
Change-Id: Id6baf2391dede5c82251e50d4dc17c234f6d361e
 2020-03-23 11:44:16 +00:00
TreeHugger Robot
725e2118cc Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: b0692bd6c5 am: 3f991e0778 
Change-Id: I46c1494e0c70ba00c7392d34355a12f43d0721b8
 2020-03-23 11:37:13 +00:00
TreeHugger Robot
17d22b0c3a Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: 4a4190dc9d am: c2cd9cc5cd 
Change-Id: Id06d59625cd965181063bb50c8f67567aea2504d
 2020-03-23 11:37:06 +00:00
Raff Tsai
8543472a19 Merge "Modify close app function." am: ce1f51128b am: 579878afcf am: ffe91b44f8 am: cf990c239e 
Change-Id: If0634932066e8e5932c2f0fd367ba3b33ae65700
 2020-03-23 11:36:49 +00:00
TreeHugger Robot
991990da36 Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: b0692bd6c5 
Change-Id: I2e1185c8113b361d954db668357e6f9e302e21d4
 2020-03-23 11:30:31 +00:00
TreeHugger Robot
3f991e0778 Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: b0692bd6c5 
Change-Id: Ie69c2346ab1b0eb44000f1cedef1bf8b386fd4f5
 2020-03-23 11:30:12 +00:00
TreeHugger Robot
c2cd9cc5cd Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c am: 4a4190dc9d 
Change-Id: I43e8ad3674ea7207eca3b3af254db5aead8005f6
 2020-03-23 11:22:11 +00:00
Raff Tsai
cf990c239e Merge "Modify close app function." am: ce1f51128b am: 579878afcf am: ffe91b44f8 
Change-Id: I2b1dea5dc42fd7cf866933500935cf7e209321d4
 2020-03-23 11:21:59 +00:00
TreeHugger Robot
4a4190dc9d Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c 
Change-Id: I8fb8f2eed514670d900c4dad4f46953ae8265249
 2020-03-23 11:16:50 +00:00
TreeHugger Robot
b0692bd6c5 Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c 
Change-Id: I494026cdde9a74e3e71051976cefb6c2633d67c8
 2020-03-23 11:16:12 +00:00
Calvin Pan
e154273edd Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3 am: 4acdc6f97e am: 39123486e4 am: 10a83f8b0f 
Change-Id: Iffc965b7950cc2c1cffa9b6980c6def65036a192
 2020-03-23 11:10:06 +00:00
Calvin Pan
10a83f8b0f Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3 am: 4acdc6f97e am: 39123486e4 
Change-Id: I7db6cecdb8293364fd06cda3c6b72d0ca2085fb5
 2020-03-23 11:09:47 +00:00
Calvin Pan
359b80e68c Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 70218097f4 am: 339b8e15ba am: 203b609f3e 
Change-Id: I095c66ed590b4827b5dc7d88c6980eca0a0f696b
 2020-03-23 11:09:42 +00:00
Raff Tsai
ffe91b44f8 Merge "Modify close app function." am: ce1f51128b am: 579878afcf 
Change-Id: I27fd2f9dbb6e852d53d02ef638d3a49abb32ac12
 2020-03-23 11:09:22 +00:00
Calvin Pan
581d53b038 Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3 am: 20376f98be am: 97fe9bd1b9 
Change-Id: I6cdd284d86fb1820819b00230810dac04ff39b0a
 2020-03-23 11:09:15 +00:00
TreeHugger Robot
6f4a9bf11c Merge "Show in UI if admin has disabled face auth" into rvc-dev 2020-03-23 10:59:16 +00:00
Calvin Pan
203b609f3e Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 70218097f4 am: 339b8e15ba 
Change-Id: I9e72dc48b942f9188196210e6b701f49c930fb8a
 2020-03-23 10:53:59 +00:00
Raff Tsai
579878afcf Merge "Modify close app function." am: ce1f51128b 
Change-Id: I80e83ae16c2a2f931604e864fb79ee1d02db6a0e
 2020-03-23 10:53:44 +00:00