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
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
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
Eric Sandness
6d9451891a
Make Logic For Selecting Title Layout Consistent am: b02952a5d3
...
Change-Id: I3477638565f28b5ca4848fec6f85e8f4ea7a3e67
2020-03-23 07:55:09 +00:00
Bonian Chen
aee7a88349
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 am: cc337985fc am: ce862691d8
...
Change-Id: I11ba6e84c9022bf5d33aa0e1fa79ab863e8441b2
2020-03-23 07:35:14 +00:00
Bonian Chen
e33f976301
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ca9e69e2b am: db6759d985
...
Change-Id: I1737797c17cde52ccb7fb601105f6289b46e88de
2020-03-23 07:08:54 +00:00
Bonian Chen
928ddce1f0
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 am: caaae4627e
...
Change-Id: I59472621fa3f658c1f3d6c112a153a4d939917e3
2020-03-23 07:08:44 +00:00
Bonian Chen
ce862691d8
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910 am: cc337985fc
...
Change-Id: I793d224dc5dd8486f953143483f908e70e8baba5
2020-03-23 07:08:43 +00:00
Bonian Chen
db6759d985
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ca9e69e2b
...
Change-Id: I78758d62bdb3a86cca1379e73f28cd5c7ac283a9
2020-03-23 06:55:04 +00:00
Bonian Chen
cc337985fc
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910
...
Change-Id: Ieb3e0265d29897b667f21db301b6fc0943e87a67
2020-03-23 06:55:02 +00:00
Bonian Chen
caaae4627e
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172 am: 3ebf728910
...
Change-Id: I659ecc4aae14fcb0bbba8af558c65adabb566bed
2020-03-23 06:54:36 +00:00
Treehugger Robot
036496e2d0
Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7
...
Change-Id: I52b931de8009f876020bdebe867d178962829e88
2020-03-23 06:47:44 +00:00
Bonian Chen
3ca9e69e2b
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172
...
Change-Id: I13bdb4cb0a9cf1cc8b7f9930a50a016d208acae3
2020-03-23 06:36:27 +00:00
Bonian Chen
3ebf728910
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172
...
Change-Id: I61ecd339475067337dc1d58ec5ac24da1036377b
2020-03-23 06:35:54 +00:00
Treehugger Robot
b301288cd7
Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b
...
Change-Id: I6a04bfbb044435e987d4f141b98e457de35e9e14
2020-03-23 06:25:45 +00:00
Eric Sandness
b02952a5d3
Make Logic For Selecting Title Layout Consistent
...
Align the logic for selecting between the setup and non-setup versions
of the lock screen settings title layout, with the logic used in
ChooseLockGeneric. This means using
WizardManagerHelper.isAnySetupWizard, rather than
WizardManagerHelper.isDeviceProvisioned.
Fixes: 151552453
Test: Manually verify screens in consumer setup, enterprise setup, and
Settings app
Change-Id: I75cd9e509320b9ef9b929dd592f16e8130d80a6e
2020-03-23 06:25:07 +00:00
Bonian Chen
31315e4172
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev
2020-03-23 06:20:42 +00:00
Treehugger Robot
456b2bf87b
Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5
...
Change-Id: Id2bbc0a3596bb9a82ea066dc512b206dd8f8b7a1
2020-03-23 06:18:45 +00:00
