This add below changes on selecting private space setting: 1. Prompt user to setup device lock if not already set 2. If device lock is set authenticate user first before displaying private space settings page Screenshot - https://screenshot.googleplex.com/4SrYHbBMJfVuoRy.png https://screenshot.googleplex.com/6vNWm7Lg83vfnH8.png RecordingLink - https://drive.google.com/file/d/1r4zb3ILPRqwvP5tlwfjQ9GgnDAW4vZg6/view?usp=drive_link Bug: 289016927 Test: atest PrivateSpaceSettingsAuthenticatorTest , atest SecuritySettingsTest Change-Id: I0e5dfb30213843c0dec60a17d01c30cd91db89b0
66 lines
2.1 KiB
Kotlin
66 lines
2.1 KiB
Kotlin
/*
|
|
* Copyright (C) 2023 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.settings.ui
|
|
|
|
import android.os.Flags
|
|
import android.platform.test.annotations.RequiresFlagsEnabled
|
|
import android.platform.test.flag.junit.DeviceFlagsValueProvider
|
|
import android.provider.Settings
|
|
import androidx.test.ext.junit.runners.AndroidJUnit4
|
|
import androidx.test.platform.app.InstrumentationRegistry
|
|
import androidx.test.uiautomator.UiDevice
|
|
import com.android.settings.ui.testutils.SettingsTestUtils.assertHasTexts
|
|
import com.android.settings.ui.testutils.SettingsTestUtils.startMainActivityFromHomeScreen
|
|
import org.junit.Before
|
|
import org.junit.Rule
|
|
import org.junit.Test
|
|
import org.junit.runner.RunWith
|
|
|
|
|
|
@RunWith(AndroidJUnit4::class)
|
|
class SecuritySettingsTest {
|
|
private val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
|
|
|
|
@get:Rule
|
|
public val mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()
|
|
|
|
@Before
|
|
fun setUp() {
|
|
device.startMainActivityFromHomeScreen(Settings.ACTION_SECURITY_SETTINGS)
|
|
}
|
|
|
|
@Test
|
|
fun hasTexts() {
|
|
device.assertHasTexts(ON_SCREEN_TEXTS)
|
|
}
|
|
|
|
@Test
|
|
@RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE)
|
|
fun privateSpace_ifFlagON() {
|
|
device.assertHasTexts(listOf("Private Space"))
|
|
}
|
|
|
|
private companion object {
|
|
// Items we really want to always show
|
|
val ON_SCREEN_TEXTS = listOf(
|
|
"Device unlock",
|
|
"Privacy",
|
|
"More security & privacy",
|
|
)
|
|
}
|
|
}
|