Mady Mellor
159538d35a
Merge "String updates" into rvc-dev
2020-03-23 15:43:29 +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
2020-03-23 15:22:40 +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
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
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
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
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
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
Raff Tsai
ffe91b44f8
Merge "Modify close app function." am: ce1f51128b am: 579878afcf
...
Change-Id: I27fd2f9dbb6e852d53d02ef638d3a49abb32ac12
2020-03-23 11:09:22 +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
Calvin Pan
39123486e4
Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3 am: 4acdc6f97e
...
Change-Id: I6b2accfb1919bf208c6e52c23425e5fe43c76c27
2020-03-23 10:53:36 +00:00
Calvin Pan
97fe9bd1b9
Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3 am: 20376f98be
...
Change-Id: I7525ddee01364ccc0404f5d87fcc1dfc219c9a05
2020-03-23 10:53:21 +00:00
Calvin Pan
339b8e15ba
Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 70218097f4
...
Change-Id: Ib445371d2ee2d1c44b10255f0e6d676d9f48b171
2020-03-23 10:34:59 +00:00
Calvin Pan
4acdc6f97e
Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3
...
Change-Id: I4ab1847461455142739863fe4e53033277c78601
2020-03-23 10:34:34 +00:00
Calvin Pan
20376f98be
Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3
...
Change-Id: I05c17062a5b67f3c5bbbb721e88e7b7c3914bbef
2020-03-23 10:34:21 +00:00
Raff Tsai
ce1f51128b
Merge "Modify close app function."
2020-03-23 10:32:29 +00:00
Calvin Pan
70218097f4
Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab
...
Change-Id: I67ac551c8498d9029a0c61ef7d1672fae0f2b18f
2020-03-23 10:23:56 +00:00
Calvin Pan
029ec754a3
Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab
...
Change-Id: I0574aaf33278a82500809e7803b61e5e12b49eb9
2020-03-23 10:23:31 +00:00
Calvin Pan
861d3446ab
Merge "Clear the entries in updateState" into rvc-dev
2020-03-23 10:11:58 +00:00
Fiona Campbell
13ba7ce883
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531 am: 878097999a am: 5d6a3e4551
...
Change-Id: Ieaab281b5dd7993d292eba4268d29a55227d9d1d
2020-03-23 10:06:25 +00:00
Fiona Campbell
deddc99d74
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: a165e13de0 am: ff3539af2c
...
Change-Id: I77a454cd031673b96efe09a956dbd7eb13915372
2020-03-23 09:47:29 +00:00
Fiona Campbell
7f434778a3
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531 am: 87f9d9aff7
...
Change-Id: I3d4831c635c380d1d28b74e5739e7604bbbdc5f1
2020-03-23 09:47:22 +00:00
Fiona Campbell
5d6a3e4551
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531 am: 878097999a
...
Change-Id: I4d3db08d01db9fa650bff590871d286d1130fc7a
2020-03-23 09:47:04 +00:00
Fiona Campbell
ff3539af2c
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: a165e13de0
...
Change-Id: I750710d381c728552d16f7b87aacf5ca673ced31
2020-03-23 09:30:48 +00:00
Fiona Campbell
878097999a
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531
...
Change-Id: I7fa774d4e6c21f722c804325d864f1955db5f3ba
2020-03-23 09:30:14 +00:00
Fiona Campbell
87f9d9aff7
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531
...
Change-Id: I3b876975c5b706b181ff2ab56f41a0b03a45a17d
2020-03-23 09:29:43 +00:00
youtengliang
aa4f582931
Modify close app function.
...
Test: atest com.android.settings.tests.perf
Change-Id: Ia504dd1185de1d33a21fec344871d4b0fabae953
2020-03-23 09:29:28 +00:00
Fiona Campbell
a165e13de0
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2
...
Change-Id: Ia2626e63c27344c591b8a54b8cec8bf0973e020e
2020-03-23 09:04:51 +00:00
Fiona Campbell
9eae2b7531
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2
...
Change-Id: Ia027a69fd2e739aba88335a208644d9be663163b
2020-03-23 09:04:26 +00:00
Fiona Campbell
9a712271f2
Merge "Fix displayed brightness value in settings." into rvc-dev
2020-03-23 08:54:26 +00:00
Eric Sandness
956761d827
Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: a4ad84f5e5 am: 8edf583e84
...
Change-Id: If1dbdadeba6232fdbb195940d2f225920ab22158
2020-03-23 08:50:11 +00:00
