Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b16030f3 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Clear pattern message when showing it again"

parents 828478da 1fc01dcd
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit

    @Override
    public void onResume(int reason) {
        displayDefaultSecurityMessage();
    }

    @Override
+54 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2018 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License
 */

package com.android.keyguard

import android.support.test.filters.SmallTest
import android.testing.AndroidTestingRunner
import android.testing.TestableLooper
import android.view.LayoutInflater

import com.android.systemui.SysuiTestCase
import com.google.common.truth.Truth.assertThat

import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith

@SmallTest
@RunWith(AndroidTestingRunner::class)
@TestableLooper.RunWithLooper
class KeyguardPatternViewTest : SysuiTestCase() {

    private lateinit var mKeyguardPatternView: KeyguardPatternView
    private lateinit var mSecurityMessage: KeyguardMessageArea

    @Before
    fun setup() {
        val inflater = LayoutInflater.from(context)
        mKeyguardPatternView = inflater.inflate(R.layout.keyguard_pattern_view, null)
                as KeyguardPatternView
        mSecurityMessage = KeyguardMessageArea.findSecurityMessageDisplay(mKeyguardPatternView)
                as KeyguardMessageArea
    }

    @Test
    fun onResume_clearsTextField() {
        mSecurityMessage.setMessage("an old message")
        mKeyguardPatternView.onResume(KeyguardSecurityView.SCREEN_ON)
        assertThat(mSecurityMessage.text).isEqualTo("")
    }
}