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

Commit b6e94698 authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add footer in private space auto lock settings page"" into main

parents 1b791e8b a4ce3bec
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -1282,8 +1282,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] -->
+0 −4
Original line number Diff line number Diff line
@@ -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