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

Animate the color transition (active<->inactive) in the mode header icon

Browse Source 
Also, don't apply the layout params, etc on each call to updateState - once per displayPreference is enough.

Fixes: 356399449
Bug: 357861830
Test: manual
Flag: android.app.modes_ui
Change-Id: I6967ea1745377d0f514ca0f68101043f017a8fd7
This commit is contained in:
Matías Hernández
2024-08-13 19:13:46 +02:00
parent f1cd68ebd3
commit 115d29e851
4 changed files with 88 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/com/android/settings/notification/modes/AbstractZenModeHeaderController.java
View File

@@ -15,6 +15,8 @@
*/
package com.android.settings.notification.modes;
import static com.google.common.base.Preconditions.checkNotNull;
import android.app.Flags;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -22,8 +24,8 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -32,13 +34,15 @@ import com.android.settingslib.notification.modes.ZenIconLoader;
import com.android.settingslib.notification.modes.ZenMode;
import com.android.settingslib.widget.LayoutPreference;
import java.util.function.Consumer;
import com.google.common.base.Objects;
import java.util.function.Function;
abstract class AbstractZenModeHeaderController extends AbstractZenModePreferenceController {
private final DashboardFragment mFragment;
private EntityHeaderController mHeaderController;
private String mCurrentIconKey;
AbstractZenModeHeaderController(
@NonNull Context context,
@@ -53,40 +57,44 @@ abstract class AbstractZenModeHeaderController extends AbstractZenModePreference
return Flags.modesApi() && Flags.modesUi();
}
protected void updateIcon(Preference preference, @NonNull ZenMode zenMode, int iconSizePx,
Function<Drawable, Drawable> modeIconStylist,
@Nullable Consumer<ImageView> iconViewCustomizer) {
if (mFragment == null) {
return;
}
protected void setUpHeader(PreferenceScreen screen, int iconSizePx) {
LayoutPreference preference = checkNotNull(screen.findPreference(getPreferenceKey()));
preference.setSelectable(false);
if (mHeaderController == null) {
final LayoutPreference pref = (LayoutPreference) preference;
mHeaderController = EntityHeaderController.newInstance(
mFragment.getActivity(),
mFragment,
pref.findViewById(R.id.entity_header));
preference.findViewById(R.id.entity_header));
}
ImageView iconView = ((LayoutPreference) preference).findViewById(R.id.entity_header_icon);
if (iconView != null) {
if (iconViewCustomizer != null) {
iconViewCustomizer.accept(iconView);
}
ViewGroup.LayoutParams layoutParams = iconView.getLayoutParams();
if (layoutParams.width != iconSizePx || layoutParams.height != iconSizePx) {
layoutParams.width = iconSizePx;
layoutParams.height = iconSizePx;
iconView.setLayoutParams(layoutParams);
}
ImageView iconView = checkNotNull(preference.findViewById(R.id.entity_header_icon));
ViewGroup.LayoutParams layoutParams = iconView.getLayoutParams();
if (layoutParams.width != iconSizePx || layoutParams.height != iconSizePx) {
layoutParams.width = iconSizePx;
layoutParams.height = iconSizePx;
iconView.setLayoutParams(layoutParams);
}
}
FutureUtil.whenDone(
zenMode.getIcon(mContext, ZenIconLoader.getInstance()),
icon -> mHeaderController
.setIcon(modeIconStylist.apply(icon))
.done(/* rebindActions= */ false),
mContext.getMainExecutor());
protected void updateIcon(Preference preference, @NonNull ZenMode zenMode,
Function<Drawable, Drawable> iconStylist, boolean isSelected) {
ImageView iconView = checkNotNull(
((LayoutPreference) preference).findViewById(R.id.entity_header_icon));
iconView.setSelected(isSelected);
if (!Objects.equal(mCurrentIconKey, zenMode.getIconKey())) {
mCurrentIconKey = zenMode.getIconKey();
FutureUtil.whenDone(
zenMode.getIcon(mContext, ZenIconLoader.getInstance()),
icon -> {
checkNotNull(mHeaderController)
.setIcon(iconStylist.apply(icon))
.done(/* rebindActions= */ false);
iconView.jumpDrawablesToCurrentState(); // Skip animation on first load.
},
mContext.getMainExecutor());
}
}
}