From a4ce3bec701bdb7f0044d2bd94fffe426773495f Mon Sep 17 00:00:00 2001
From: Joseph Vincent <josephpv@google.com>
Date: Fri, 7 Jun 2024 09:18:54 +0000
Subject: [PATCH] Revert "Add footer in private space auto lock settings page"

This reverts commit 5fd6d6435b4f692008c1b851d265bd1df9987462.

Reason for revert: As per b/343166689#comment4 this change as this is not needed based on the feedback from leads review.

Change-Id: Iad31aafbce5f3f9fc37fdd8fb4d5582cfae9d8b7
---
 res/values/strings.xml                                        | 2 --
 .../privatespace/autolock/AutoLockSettingsFragment.java       | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 25212380e74..3e097b87726 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1280,8 +1280,6 @@
     <string name="private_space_auto_lock_after_inactivity">5 minutes after screen timeout</string>
     <!-- Configure auto lock: Value for auto lock configuration to lock private space only after device restarts. [CHAR LIMIT=40] -->
     <string name="private_space_auto_lock_after_device_restart">Only after device restarts</string>
-    <!-- Note in footer of private space auto lock settings page that using privae apps may need a lock verification when a separate lock is used for private space. [CHAR LIMIT=NONE] -->
-    <string name="private_space_auto_lock_footer_message">If you use a different lock for your private space, you may need to verify it\u2019s you to open apps in your private space.</string>
     <!-- Title for the settings page for hiding private space. [CHAR LIMIT=45] -->
     <string name="private_space_hide_page_title">Hide private space</string>
     <!-- Title for the settings preference for hiding private space when it's locked. [CHAR LIMIT=60] -->
diff --git a/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java b/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java
index decca843e29..cb332d1e515 100644
--- a/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java
+++ b/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java
@@ -31,7 +31,6 @@ import com.android.settings.R;
 import com.android.settings.privatespace.PrivateSpaceMaintainer;
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.widget.CandidateInfo;
-import com.android.settingslib.widget.FooterPreference;
 import com.android.settingslib.widget.TopIntroPreference;
 
 import java.util.ArrayList;
@@ -77,10 +76,7 @@ public class AutoLockSettingsFragment extends RadioButtonPickerFragment {
     protected void addStaticPreferences(PreferenceScreen screen) {
         final TopIntroPreference introPreference = new TopIntroPreference(screen.getContext());
         introPreference.setTitle(R.string.private_space_auto_lock_page_summary);
-        final FooterPreference footerPreference = new FooterPreference(screen.getContext());
-        footerPreference.setSummary(R.string.private_space_auto_lock_footer_message);
         screen.addPreference(introPreference);
-        screen.addPreference(footerPreference);
     }
 
     @Override