Commit Graph

63043 Commits

Author SHA1 Message Date
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
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
643b530e96 Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531 am: 878097999a am: 5d6a3e4551 am: 13ba7ce883
Change-Id: Ied2f06c5729ec8b027f732abf5208a84505c938d
2020-03-23 10:06:33 +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
2d86cf4e70 Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: a165e13de0 am: ff3539af2c am: deddc99d74
Change-Id: I54efa0d5a7f5e32db8fe28d6460bb2741a5aa2ad
2020-03-23 10:06:25 +00:00
Fiona Campbell
56df409d78 Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2 am: 9eae2b7531 am: 87f9d9aff7 am: 7f434778a3
Change-Id: I0a671c288791bbd5a6521e4fdffcfb6af4a47724
2020-03-23 10:05:50 +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
1e8ba370b4 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: a4ad84f5e5 am: 8edf583e84 am: 956761d827
Change-Id: I337d52a88ff6a1b7639a7ee768bcf687cf0093bc
2020-03-23 08:50:33 +00:00
Eric Sandness
c3697ef915 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 0d022fced2 am: 731399ddf3 am: b8d59b391a
Change-Id: I7541f708592777e705eb3ea49ff7235fc3caed56
2020-03-23 08:50:19 +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
Eric Sandness
077047738f Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: 0bf7413ff2 am: 1a50bf5f6f
Change-Id: Ie81292b994e769fac375f96eaa47f06de071f377
2020-03-23 08:49:46 +00:00
Eric Sandness
b8d59b391a Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 0d022fced2 am: 731399ddf3
Change-Id: I29966ec027b89542a114d1261c36bce2029056aa
2020-03-23 08:36:45 +00:00
Eric Sandness
1a50bf5f6f Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: 0bf7413ff2
Change-Id: I64428774b339457575d283bfd7e521b40b26bf19
2020-03-23 08:36:21 +00:00
Eric Sandness
8edf583e84 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a am: a4ad84f5e5
Change-Id: I25ee9d5552c16570778dfc1346782d810639c78e
2020-03-23 08:36:17 +00:00
Arc Wang
fafcd3b362 [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
Some tests are removed because WifiTracerLib listens to most intents
and callbacks to Settings APP, most of the receiving intent tests are
removed.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ie726938b7c6e94bbaf6479f6a8797a92d869ba8c
2020-03-23 16:21:07 +08:00
Eric Sandness
a4ad84f5e5 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a
Change-Id: Iad0129b7d3628cc2ddbe0510f855c4861bf3f99a
2020-03-23 08:19:15 +00:00
Eric Sandness
731399ddf3 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 0d022fced2
Change-Id: If5a2be4cdf1c2466db2c7358b99096521f9df493
2020-03-23 08:19:06 +00:00
Eric Sandness
0bf7413ff2 Make Logic For Selecting Title Layout Consistent am: b02952a5d3 am: 6d9451891a
Change-Id: Ie8144a556fa767e274ececbeb58f87844cdd31a9
2020-03-23 08:18:48 +00:00
Eric Sandness
0d022fced2 Make Logic For Selecting Title Layout Consistent am: b02952a5d3
Change-Id: Ie91236f0ec08795a7db45baf98844fc10fcb4dcb
2020-03-23 07:55:47 +00:00