aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-17 09:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

RESTRICT AUTOMERGE Moved enteprise resource updatability to Launcher3

Browse Source 
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I095a1da30766e4b4eab33f42b034601b3322eb3d
This commit is contained in:
kholoud mohamed
2022-03-14 13:58:51 +00:00
parent deae9343be
commit e210b47c20
3 changed files with 121 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
View File

@@ -15,20 +15,6 @@
*/
package com.android.launcher3.model;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_PERSONAL_TAB;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_PERSONAL_TAB_ACCESSIBILITY;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_WORK_TAB;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_WORK_TAB_ACCESSIBILITY;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.DISABLED_BY_ADMIN_MESSAGE;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.WIDGETS_PERSONAL_TAB;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.WIDGETS_WORK_TAB;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_FOLDER_NAME;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_EDU;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_EDU_ACCEPT;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_ENABLE_BUTTON;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_PAUSED_DESCRIPTION;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_PAUSED_TITLE;
import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_PAUSE_BUTTON;
import static android.text.format.DateUtils.DAY_IN_MILLIS;
import static android.text.format.DateUtils.formatElapsedTime;
@@ -46,7 +32,6 @@ import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
import static java.util.stream.Collectors.toCollection;
import android.app.StatsManager;
import android.app.admin.DevicePolicyManager;
import android.app.prediction.AppPredictionContext;
import android.app.prediction.AppPredictionManager;
import android.app.prediction.AppPredictor;
@@ -150,42 +135,6 @@ public class QuickstepModelDelegate extends ModelDelegate {
mActive = true;
}
@Override
@WorkerThread
public void loadStringCache(StringCache cache) {
cache.loadDefaultStrings(mContext);
cache.workProfileEdu = getEnterpriseString(WORK_PROFILE_EDU, cache.workProfileEdu);
cache.workProfileEduAccept = getEnterpriseString(
WORK_PROFILE_EDU_ACCEPT, cache.workProfileEduAccept);
cache.workProfilePausedTitle = getEnterpriseString(
WORK_PROFILE_PAUSED_TITLE, cache.workProfilePausedTitle);
cache.workProfilePausedDescription = getEnterpriseString(
WORK_PROFILE_PAUSED_DESCRIPTION, cache.workProfilePausedDescription);
cache.workProfilePauseButton = getEnterpriseString(
WORK_PROFILE_PAUSE_BUTTON, cache.workProfilePauseButton);
cache.workProfileEnableButton = getEnterpriseString(
WORK_PROFILE_ENABLE_BUTTON, cache.workProfileEnableButton);
cache.allAppsWorkTab = getEnterpriseString(ALL_APPS_WORK_TAB, cache.allAppsWorkTab);
cache.allAppsPersonalTab = getEnterpriseString(
ALL_APPS_PERSONAL_TAB, cache.allAppsPersonalTab);
cache.allAppsWorkTabAccessibility = getEnterpriseString(
ALL_APPS_WORK_TAB_ACCESSIBILITY, cache.allAppsWorkTabAccessibility);
cache.allAppsPersonalTabAccessibility = getEnterpriseString(
ALL_APPS_PERSONAL_TAB_ACCESSIBILITY, cache.allAppsPersonalTabAccessibility);
cache.workFolderName = getEnterpriseString(WORK_FOLDER_NAME, cache.workFolderName);
cache.widgetsWorkTab = getEnterpriseString(WIDGETS_WORK_TAB, cache.widgetsWorkTab);
cache.widgetsPersonalTab = getEnterpriseString(
WIDGETS_PERSONAL_TAB, cache.widgetsPersonalTab);
cache.disabledByAdminMessage = getEnterpriseString(
DISABLED_BY_ADMIN_MESSAGE, cache.disabledByAdminMessage);
}
private String getEnterpriseString(String updatableStringId, String defaultString) {
DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
return dpm.getString(updatableStringId, () -> defaultString);
}
@Override
public void workspaceLoadComplete() {
super.workspaceLoadComplete();