diff --git a/res/layout/work_tab_footer.xml b/res/layout/work_tab_footer.xml index e3416ac7fe..dc0fdd4eef 100644 --- a/res/layout/work_tab_footer.xml +++ b/res/layout/work_tab_footer.xml @@ -73,7 +73,6 @@ android:lines="1" android:minHeight="24dp" android:paddingStart="12dp" - android:text="@string/managed_by_your_organisation" android:textColor="?android:attr/textColorHint" android:textSize="13sp"/> diff --git a/res/values/strings.xml b/res/values/strings.xml index d77065c11f..ee09946717 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -324,13 +324,16 @@ Work - + Work profile - + Find work apps here - - Each work app has an orange badge, which means it\'s kept secure by your organization. Work apps can be moved to your Home Screen for easier access. - - Managed by your organisation + + Each work app has an orange badge and is kept secure by your organization. Move apps to your Home screen for easier access. + + Managed by your organization + + Notifications and apps are off diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 234eb81ed3..769f9ba084 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -41,6 +41,7 @@ import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.allapps.AlphabeticalAppsList.AdapterItem; import com.android.launcher3.anim.SpringAnimationHandler; +import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.discovery.AppDiscoveryAppInfo; import com.android.launcher3.discovery.AppDiscoveryItemView; @@ -377,6 +378,11 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter userProfiles = userManager.getUserProfiles(); - for (UserHandle userProfile : userProfiles) { - if (Process.myUserHandle().equals(userProfile)) { - continue; - } - if (userManager.isQuietModeEnabled(userProfile)) { - return true; - } - } - return false; + setCheckedInternal(!userManager.isAnyProfileQuietModeEnabled()); + setEnabled(true); } private void trySetQuietModeEnabledToAllProfilesAsync(boolean enabled) { diff --git a/src/com/android/launcher3/compat/UserManagerCompat.java b/src/com/android/launcher3/compat/UserManagerCompat.java index ddb244a175..62055dc49a 100644 --- a/src/com/android/launcher3/compat/UserManagerCompat.java +++ b/src/com/android/launcher3/compat/UserManagerCompat.java @@ -64,4 +64,5 @@ public abstract class UserManagerCompat { public abstract boolean isDemoUser(); public abstract boolean requestQuietModeEnabled(boolean enableQuietMode, UserHandle user); + public abstract boolean isAnyProfileQuietModeEnabled(); } diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java index 5585fe46e9..e57786d8cb 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVL.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java @@ -87,6 +87,11 @@ public class UserManagerCompatVL extends UserManagerCompat { return false; } + @Override + public boolean isAnyProfileQuietModeEnabled() { + return false; + } + @Override public void enableAndResetCache() { synchronized (this) { diff --git a/src/com/android/launcher3/compat/UserManagerCompatVN.java b/src/com/android/launcher3/compat/UserManagerCompatVN.java index 50a02178d5..3733565943 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVN.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVN.java @@ -19,8 +19,11 @@ package com.android.launcher3.compat; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; +import android.os.Process; import android.os.UserHandle; +import java.util.List; + @TargetApi(Build.VERSION_CODES.N) public class UserManagerCompatVN extends UserManagerCompatVM { @@ -37,5 +40,19 @@ public class UserManagerCompatVN extends UserManagerCompatVM { public boolean isUserUnlocked(UserHandle user) { return mUserManager.isUserUnlocked(user); } + + @Override + public boolean isAnyProfileQuietModeEnabled() { + List userProfiles = getUserProfiles(); + for (UserHandle userProfile : userProfiles) { + if (Process.myUserHandle().equals(userProfile)) { + continue; + } + if (isQuietModeEnabled(userProfile)) { + return true; + } + } + return false; + } }