PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joseph Vincent
2024-06-07 10:24:38 +00:00
committed by Android (Google) Code Review
parent 1b791e8b1b a4ce3bec70
commit b6e9469834
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1282,8 +1282,6 @@
<string name="private_space_auto_lock_after_inactivity">5 minutes after screen timeout</string> <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] --> <!-- 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> <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] --> <!-- Title for the settings page for hiding private space. [CHAR LIMIT=45] -->
<string name="private_space_hide_page_title">Hide private space</string> <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] --> <!-- Title for the settings preference for hiding private space when it's locked. [CHAR LIMIT=60] -->

4
src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java
View File

@@ -31,7 +31,6 @@ import com.android.settings.R;
import com.android.settings.privatespace.PrivateSpaceMaintainer; import com.android.settings.privatespace.PrivateSpaceMaintainer;
import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo; import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.TopIntroPreference; import com.android.settingslib.widget.TopIntroPreference;
import java.util.ArrayList; import java.util.ArrayList;
@@ -77,10 +76,7 @@ public class AutoLockSettingsFragment extends RadioButtonPickerFragment {
protected void addStaticPreferences(PreferenceScreen screen) { protected void addStaticPreferences(PreferenceScreen screen) {
final TopIntroPreference introPreference = new TopIntroPreference(screen.getContext()); final TopIntroPreference introPreference = new TopIntroPreference(screen.getContext());
introPreference.setTitle(R.string.private_space_auto_lock_page_summary); 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(introPreference);
screen.addPreference(footerPreference);
} }
@Override @Override