Merge Ambient display into Lockscreen settings.

And remove the entry point from security page. Now we only have 1 entry
point from Display page.

Change-Id: I06bc15a6fd8802a4918d8772af2722d5aafa332e
Fixes: 71892510
Test: robotests
This commit is contained in:
Fan Zhang
2018-05-11 17:49:39 -07:00
parent b976044f57
commit 30d4d015b5
18 changed files with 184 additions and 507 deletions

View File

@@ -44,12 +44,6 @@
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_lockscreen" />
<Preference
android:key="lockscreen_preferences"
android:title="@string/lockscreen_settings_title"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.security.LockscreenDashboardFragment" />
<Preference
android:key="fingerprint_settings"
android:title="@string/security_settings_fingerprint_preference_title"