diff --git a/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java index 4ad232ad25eba..8bd0f7b2fb57b 100644 --- a/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java +++ b/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java @@ -15,10 +15,8 @@ */ package com.android.internal.app; -import android.annotation.DrawableRes; import android.annotation.IntDef; import android.annotation.Nullable; -import android.annotation.StringRes; import android.app.AppGlobals; import android.app.admin.DevicePolicyEventLogger; import android.content.ContentResolver; @@ -33,7 +31,6 @@ import android.stats.devicepolicy.DevicePolicyEnums; import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import android.widget.ImageView; import android.widget.TextView; import com.android.internal.R; @@ -347,30 +344,6 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { protected abstract void showNoWorkToPersonalIntentsEmptyState( ResolverListAdapter activeListAdapter); - /** - * Updates padding and visibilities as a result of an orientation change. - *

They are not updated automatically, because the view is cached when created. - *

When overridden, make sure to always call the super method. - */ - void updateAfterConfigChange() { - for (int i = 0; i < getItemCount(); i++) { - ViewGroup emptyStateView = getItem(i).getEmptyStateView(); - ImageView icon = emptyStateView.findViewById(R.id.resolver_empty_state_icon); - updateIconVisibility(icon, emptyStateView); - } - } - - private void updateIconVisibility(ImageView icon, ViewGroup emptyStateView) { - if (isSpinnerShowing(emptyStateView)) { - icon.setVisibility(View.INVISIBLE); - } else if (mWorkProfileUserHandle != null - && !getContext().getResources().getBoolean(R.bool.resolver_landscape_phone)) { - icon.setVisibility(View.VISIBLE); - } else { - icon.setVisibility(View.GONE); - } - } - /** * The empty state screens are shown according to their priority: *

    @@ -461,27 +434,13 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { } } - protected void showEmptyState(ResolverListAdapter activeListAdapter, - @DrawableRes int iconRes, @StringRes int titleRes, @StringRes int subtitleRes) { - showEmptyState(activeListAdapter, iconRes, titleRes, subtitleRes, /* buttonOnClick */ null); + protected void showEmptyState(ResolverListAdapter activeListAdapter, String title, + String subtitle) { + showEmptyState(activeListAdapter, title, subtitle, /* buttonOnClick */ null); } protected void showEmptyState(ResolverListAdapter activeListAdapter, - @DrawableRes int iconRes, String title, String subtitle) { - showEmptyState(activeListAdapter, iconRes, title, subtitle, /* buttonOnClick */ null); - } - - protected void showEmptyState(ResolverListAdapter activeListAdapter, - @DrawableRes int iconRes, @StringRes int titleRes, @StringRes int subtitleRes, - View.OnClickListener buttonOnClick) { - String title = titleRes == 0 ? null : mContext.getString(titleRes); - String subtitle = subtitleRes == 0 ? null : mContext.getString(subtitleRes); - showEmptyState(activeListAdapter, iconRes, title, subtitle, buttonOnClick); - } - - protected void showEmptyState(ResolverListAdapter activeListAdapter, - @DrawableRes int iconRes, String title, String subtitle, - View.OnClickListener buttonOnClick) { + String title, String subtitle, View.OnClickListener buttonOnClick) { ProfileDescriptor descriptor = getItem( userHandleToPageIndex(activeListAdapter.getUserHandle())); descriptor.rootView.findViewById(R.id.resolver_list).setVisibility(View.GONE); @@ -507,10 +466,6 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { button.setVisibility(buttonOnClick != null ? View.VISIBLE : View.GONE); button.setOnClickListener(buttonOnClick); - ImageView icon = emptyStateView.findViewById(R.id.resolver_empty_state_icon); - icon.setImageResource(iconRes); - updateIconVisibility(icon, emptyStateView); - activeListAdapter.markTabLoaded(); } @@ -537,7 +492,6 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { } private void showSpinner(View emptyStateView) { - emptyStateView.findViewById(R.id.resolver_empty_state_icon).setVisibility(View.INVISIBLE); emptyStateView.findViewById(R.id.resolver_empty_state_title).setVisibility(View.INVISIBLE); emptyStateView.findViewById(R.id.resolver_empty_state_button).setVisibility(View.INVISIBLE); emptyStateView.findViewById(R.id.resolver_empty_state_progress).setVisibility(View.VISIBLE); @@ -545,7 +499,6 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { } private void resetViewVisibilitiesForWorkProfileEmptyState(View emptyStateView) { - emptyStateView.findViewById(R.id.resolver_empty_state_icon).setVisibility(View.VISIBLE); emptyStateView.findViewById(R.id.resolver_empty_state_title).setVisibility(View.VISIBLE); emptyStateView.findViewById(R.id.resolver_empty_state_subtitle).setVisibility(View.VISIBLE); emptyStateView.findViewById(R.id.resolver_empty_state_button).setVisibility(View.INVISIBLE); @@ -554,7 +507,6 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { } private void resetViewVisibilitiesForConsumerUserEmptyState(View emptyStateView) { - emptyStateView.findViewById(R.id.resolver_empty_state_icon).setVisibility(View.GONE); emptyStateView.findViewById(R.id.resolver_empty_state_title).setVisibility(View.GONE); emptyStateView.findViewById(R.id.resolver_empty_state_subtitle).setVisibility(View.GONE); emptyStateView.findViewById(R.id.resolver_empty_state_button).setVisibility(View.GONE); diff --git a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java index 916408984674d..d35d5ca6fca7f 100644 --- a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java +++ b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java @@ -193,7 +193,6 @@ public class ChooserMultiProfilePagerAdapter extends AbstractMultiProfilePagerAd protected void showWorkProfileOffEmptyState(ResolverListAdapter activeListAdapter, View.OnClickListener listener) { showEmptyState(activeListAdapter, - R.drawable.ic_work_apps_off, getWorkAppPausedTitle(), /* subtitle = */ null, listener); @@ -203,12 +202,10 @@ public class ChooserMultiProfilePagerAdapter extends AbstractMultiProfilePagerAd protected void showNoPersonalToWorkIntentsEmptyState(ResolverListAdapter activeListAdapter) { if (mIsSendAction) { showEmptyState(activeListAdapter, - R.drawable.ic_sharing_disabled, getCrossProfileBlockedTitle(), getCantShareWithWorkMessage()); } else { showEmptyState(activeListAdapter, - R.drawable.ic_sharing_disabled, getCrossProfileBlockedTitle(), getCantAccessWorkMessage()); } @@ -218,12 +215,10 @@ public class ChooserMultiProfilePagerAdapter extends AbstractMultiProfilePagerAd protected void showNoWorkToPersonalIntentsEmptyState(ResolverListAdapter activeListAdapter) { if (mIsSendAction) { showEmptyState(activeListAdapter, - R.drawable.ic_sharing_disabled, getCrossProfileBlockedTitle(), getCantShareWithPersonalMessage()); } else { showEmptyState(activeListAdapter, - R.drawable.ic_sharing_disabled, getCrossProfileBlockedTitle(), getCantAccessPersonalMessage()); } @@ -231,19 +226,13 @@ public class ChooserMultiProfilePagerAdapter extends AbstractMultiProfilePagerAd @Override protected void showNoPersonalAppsAvailableEmptyState(ResolverListAdapter listAdapter) { - showEmptyState(listAdapter, - R.drawable.ic_no_apps, - getNoPersonalAppsAvailableMessage(), - /* subtitle= */ null); + showEmptyState(listAdapter, getNoPersonalAppsAvailableMessage(), /* subtitle= */ null); } @Override protected void showNoWorkAppsAvailableEmptyState(ResolverListAdapter listAdapter) { - showEmptyState(listAdapter, - R.drawable.ic_no_apps, - getNoWorkAppsAvailableMessage(), - /* subtitle = */ null); + showEmptyState(listAdapter, getNoWorkAppsAvailableMessage(), /* subtitle = */ null); } private String getWorkAppPausedTitle() { diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 17c2dc09140e9..3d93b2a231c2c 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -673,7 +673,6 @@ public class ResolverActivity extends Activity implements getResources().getDimensionPixelSize(R.dimen.resolver_button_bar_spacing), buttonBar.getPaddingRight(), getResources().getDimensionPixelSize(R.dimen.resolver_button_bar_spacing)); - mMultiProfilePagerAdapter.updateAfterConfigChange(); } @Override // ResolverListCommunicator diff --git a/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java index f4e568b6676af..0b33501fd8751 100644 --- a/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java +++ b/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java @@ -26,7 +26,6 @@ import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK import android.annotation.Nullable; import android.app.admin.DevicePolicyManager; import android.content.Context; -import android.content.res.Resources; import android.os.UserHandle; import android.view.LayoutInflater; import android.view.View; @@ -74,24 +73,6 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA mShouldShowNoCrossProfileIntentsEmptyState = shouldShowNoCrossProfileIntentsEmptyState; } - @Override - void updateAfterConfigChange() { - super.updateAfterConfigChange(); - for (ResolverProfileDescriptor descriptor : mItems) { - View emptyStateCont = - descriptor.rootView.findViewById(R.id.resolver_empty_state_container); - Resources resources = getContext().getResources(); - emptyStateCont.setPadding( - emptyStateCont.getPaddingLeft(), - resources.getDimensionPixelSize( - R.dimen.resolver_empty_state_container_padding_top), - emptyStateCont.getPaddingRight(), - resources.getDimensionPixelSize( - R.dimen.resolver_empty_state_container_padding_bottom)); - - } - } - private ResolverProfileDescriptor createProfileDescriptor( ResolverListAdapter adapter) { final LayoutInflater inflater = LayoutInflater.from(getContext()); @@ -203,7 +184,6 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA protected void showWorkProfileOffEmptyState(ResolverListAdapter activeListAdapter, View.OnClickListener listener) { showEmptyState(activeListAdapter, - R.drawable.ic_work_apps_off, getWorkAppPausedTitle(), /* subtitle = */ null, listener); @@ -212,7 +192,6 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA @Override protected void showNoPersonalToWorkIntentsEmptyState(ResolverListAdapter activeListAdapter) { showEmptyState(activeListAdapter, - R.drawable.ic_sharing_disabled, getCrossProfileBlockedTitle(), getCantAccessWorkMessage()); } @@ -220,7 +199,6 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA @Override protected void showNoWorkToPersonalIntentsEmptyState(ResolverListAdapter activeListAdapter) { showEmptyState(activeListAdapter, - R.drawable.ic_sharing_disabled, getCrossProfileBlockedTitle(), getCantAccessPersonalMessage()); } @@ -228,7 +206,6 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA @Override protected void showNoPersonalAppsAvailableEmptyState(ResolverListAdapter listAdapter) { showEmptyState(listAdapter, - R.drawable.ic_no_apps, getNoPersonalAppsAvailableMessage(), /* subtitle = */ null); } @@ -236,7 +213,6 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA @Override protected void showNoWorkAppsAvailableEmptyState(ResolverListAdapter listAdapter) { showEmptyState(listAdapter, - R.drawable.ic_no_apps, getNoWorkAppsAvailableMessage(), /* subtitle= */ null); } diff --git a/core/res/res/drawable/ic_no_apps.xml b/core/res/res/drawable/ic_no_apps.xml deleted file mode 100644 index 4d296bddd8137..0000000000000 --- a/core/res/res/drawable/ic_no_apps.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/core/res/res/drawable/ic_sharing_disabled.xml b/core/res/res/drawable/ic_sharing_disabled.xml deleted file mode 100644 index d488cdbb8b7b9..0000000000000 --- a/core/res/res/drawable/ic_sharing_disabled.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/core/res/res/drawable/ic_work_apps_off.xml b/core/res/res/drawable/ic_work_apps_off.xml deleted file mode 100644 index f62eb2769beff..0000000000000 --- a/core/res/res/drawable/ic_work_apps_off.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - \ No newline at end of file diff --git a/core/res/res/layout/resolver_empty_states.xml b/core/res/res/layout/resolver_empty_states.xml index 8594c33c3082a..d5174f8b4cd9c 100644 --- a/core/res/res/layout/resolver_empty_states.xml +++ b/core/res/res/layout/resolver_empty_states.xml @@ -30,36 +30,30 @@ android:paddingTop="@dimen/resolver_empty_state_container_padding_top" android:paddingBottom="@dimen/resolver_empty_state_container_padding_bottom" android:gravity="center_horizontal"> -