Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Move applock to apps section

Browse Source 
security advance section is too hidden
so that users even don't know about applock.

Change-Id: Iaaa2fd17befd915df485e16461abcc8ffc0f7191
This commit is contained in:
Dhina17
2024-11-29 16:44:27 +05:30
committed by Joey
parent f8ef1252b4
commit 49c520a7ab
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/apps.xml
View File

@@ -75,11 +75,17 @@
android:targetPackage="${applicationId}"/>
</Preference>
<!-- App lock -->
<com.android.settingslib.RestrictedPreference
android:key="app_lock"
android:title="@string/app_lock_title"
android:order="-994" />
<Preference
android:key="game_settings"
android:title="@string/game_space_title"
android:summary="@string/game_space_summary"
android:order="-994"
android:order="-993"
settings:controller="com.android.settings.applications.GameSpaceController">
</Preference>

5
res/xml/more_security_privacy_settings.xml
View File

@@ -158,11 +158,6 @@
android:key="security_settings_device_admin_category"
android:layout="@layout/preference_category_no_label">
<!-- App lock -->
<com.android.settingslib.RestrictedPreference
android:key="app_lock"
android:title="@string/app_lock_title" />
<Preference
android:key="manage_device_admin"
android:title="@string/manage_device_admin"

12
src/com/android/settings/applications/AppDashboardFragment.java
View File

@@ -25,8 +25,10 @@ import com.android.settings.R;
import com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.applock.AppLockSettingsPreferenceController;
import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
@@ -40,9 +42,11 @@ public class AppDashboardFragment extends DashboardFragment {
private static final String TAG = "AppDashboardFragment";
private static final String ADVANCED_CATEGORY_KEY = "advanced_category";
private static final String ASPECT_RATIO_PREF_KEY = "aspect_ratio_apps";
private static final String APP_LOCK_PREF_KEY = "app_lock";
private AppsPreferenceController mAppsPreferenceController;
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
DashboardFragment host, Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new AppsPreferenceController(context));
@@ -52,6 +56,8 @@ public class AppDashboardFragment extends DashboardFragment {
new AdvancedAppsPreferenceCategoryController(context, ADVANCED_CATEGORY_KEY);
advancedCategoryController.setChildren(List.of(aspectRatioAppsPreferenceController));
controllers.add(advancedCategoryController);
controllers.add(new AppLockSettingsPreferenceController(
context, APP_LOCK_PREF_KEY, host, lifecycle));
return controllers;
}
@@ -95,7 +101,7 @@ public class AppDashboardFragment extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context);
return buildPreferenceControllers(context, this /* host */, getSettingsLifecycle());
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
@@ -111,7 +117,7 @@ public class AppDashboardFragment extends DashboardFragment {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context);
return buildPreferenceControllers(context, null /* host */, null);
}
};
}

3
src/com/android/settings/safetycenter/SafetyCenterUtils.java
View File

@@ -39,7 +39,6 @@ import com.android.settings.notification.LockScreenNotificationPreferenceControl
import com.android.settings.privacy.PrivacyDashboardFragment;
import com.android.settings.security.ChangeProfileScreenLockPreferenceController;
import com.android.settings.security.LockUnificationPreferenceController;
import com.android.settings.security.applock.AppLockSettingsPreferenceController;
import com.android.settings.security.trustagent.TrustAgentListPreferenceController;
import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -82,8 +81,6 @@ public final class SafetyCenterUtils {
.add(new CombinedBiometricProfileStatusPreferenceController(context, lifecycle));
controllers.add(new PreferenceCategoryController(context, WORK_PROFILE_SECURITY_CATEGORY)
.setChildren(profileSecurityControllers));
controllers.add(new AppLockSettingsPreferenceController(
context, APP_LOCK_PREF_KEY, host, lifecycle));
controllers.addAll(profileSecurityControllers);
return controllers;
}