Merge "Add Lock Screen page skeleton and TS flag" into main (ab9f9780) · Commits · e / os / android_packages_apps_Settings

aconfig/catalyst/lockscreen.aconfig

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		package: "com.android.settings.flags"
		container: "system"

		flag {
		name: "catalyst_lockscreen_from_display_settings"
		namespace: "android_settings"
		description: "Flag for Display & touch > Lock screen"
		bug: "323791114"
		}

src/com/android/settings/security/LockScreenPreferenceScreen.kt

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.security

		import android.content.Context
		import com.android.settings.R
		import com.android.settings.flags.Flags
		import com.android.settingslib.metadata.ProvidePreferenceScreen
		import com.android.settingslib.metadata.preferenceHierarchy
		import com.android.settingslib.preference.PreferenceScreenCreator

		@ProvidePreferenceScreen
		open class LockScreenPreferenceScreen : PreferenceScreenCreator {
		override val key: String
		get() = KEY

		override val title: Int
		get() = R.string.lockscreen_settings_title

		override val keywords: Int
		get() = R.string.keywords_ambient_display_screen

		override fun isFlagEnabled(context: Context) = Flags.catalystLockscreenFromDisplaySettings()

		override fun hasCompleteHierarchy() = false

		override fun fragmentClass() = LockscreenDashboardFragment::class.java

		override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {
		// add hierarchy here
		}

		companion object {
		const val KEY = "lockscreen_from_display_settings"
		}
		}
		No newline at end of file

src/com/android/settings/security/LockscreenDashboardFragment.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@ import android.os.Handler;
		import android.os.Looper;
		import android.provider.Settings;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.annotation.VisibleForTesting;

		import com.android.settings.R;
		@@ -160,6 +162,11 @@ public class LockscreenDashboardFragment extends DashboardFragment
		}
		}

		@Override
		public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
		return LockScreenPreferenceScreen.KEY;
		}

		private AmbientDisplayConfiguration getConfig(Context context) {
		if (mConfig == null) {
		mConfig = new AmbientDisplayConfiguration(context);