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

Merge "Add background to ambient volume control icons" into main

Browse Source
This commit is contained in:
Angela Wang
2025-03-13 12:49:10 -07:00
committed by Android (Google) Code Review
parent bfab8a80d9 c47713d66f
commit faebda0cda
8 changed files with 185 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/bluetooth/AmbientVolumePreference.java
View File

@@ -39,6 +39,7 @@ import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.AmbientVolumeUi;
import com.android.settingslib.widget.SettingsThemeHelper;
import com.android.settingslib.widget.SliderPreference;
import com.google.common.collect.BiMap;
@@ -68,6 +69,8 @@ public class AmbientVolumePreference extends PreferenceGroup implements AmbientV
@Nullable
private View mExpandIcon;
@Nullable
private View mVolumeIconFrame;
@Nullable
private ImageView mVolumeIcon;
private boolean mExpandable = true;
private boolean mExpanded = false;
@@ -95,7 +98,10 @@ public class AmbientVolumePreference extends PreferenceGroup implements AmbientV
public AmbientVolumePreference(@NonNull Context context) {
super(context, null);
setLayoutResource(R.layout.preference_ambient_volume);
int resId = SettingsThemeHelper.isExpressiveTheme(context)
? R.layout.preference_ambient_volume_expressive
: R.layout.preference_ambient_volume;
setLayoutResource(resId);
setIcon(com.android.settingslib.R.drawable.ic_ambient_volume);
setTitle(R.string.bluetooth_ambient_volume_control);
setSelectable(false);
@@ -110,8 +116,12 @@ public class AmbientVolumePreference extends PreferenceGroup implements AmbientV
mVolumeIcon = holder.itemView.requireViewById(com.android.internal.R.id.icon);
mVolumeIcon.getDrawable().mutate().setTint(getContext().getColor(
com.android.internal.R.color.materialColorOnPrimaryContainer));
final View iconView = holder.itemView.requireViewById(R.id.icon_frame);
iconView.setOnClickListener(v -> {
mVolumeIconFrame = holder.itemView.requireViewById(R.id.icon_frame);
int volumeIconBackgroundResId = SettingsThemeHelper.isExpressiveTheme(getContext())
? R.drawable.ambient_icon_background_expressive
: R.drawable.ambient_icon_background;
mVolumeIconFrame.setBackgroundResource(volumeIconBackgroundResId);
mVolumeIconFrame.setOnClickListener(v -> {
if (!mMutable) {
return;
}
@@ -313,7 +323,7 @@ public class AmbientVolumePreference extends PreferenceGroup implements AmbientV
}
private void updateVolumeIcon() {
if (mVolumeIcon == null) {
if (mVolumeIcon == null || mVolumeIconFrame == null) {
return;
}
mVolumeIcon.setImageLevel(mMuted ? 0 : mVolumeLevel);
@@ -321,10 +331,10 @@ public class AmbientVolumePreference extends PreferenceGroup implements AmbientV
final int stringRes = mMuted ? R.string.bluetooth_ambient_volume_unmute
: R.string.bluetooth_ambient_volume_mute;
mVolumeIcon.setContentDescription(getContext().getString(stringRes));
mVolumeIcon.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
mVolumeIconFrame.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
} else {
mVolumeIcon.setContentDescription(null);
mVolumeIcon.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
mVolumeIconFrame.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
}
}

17
src/com/android/settings/bluetooth/BluetoothDetailsAmbientVolumePreferenceController.java
View File

@@ -20,6 +20,7 @@ import static com.android.settings.bluetooth.BluetoothDetailsHearingDeviceContro
import static com.android.settings.bluetooth.BluetoothDetailsHearingDeviceController.ORDER_AMBIENT_VOLUME;
import android.content.Context;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -133,11 +134,17 @@ public class BluetoothDetailsAmbientVolumePreferenceController extends Bluetooth
@Override
public boolean isAvailable() {
return mCachedDevice.isHearingDevice()
&& mCachedDevice.getProfiles().stream().anyMatch(
profile -> profile instanceof VolumeControlProfile)
&& mAmbientUiController != null
&& mAmbientUiController.isAmbientControlAvailable();
boolean isHearingDevice = mCachedDevice.isHearingDevice();
boolean supportVcp = mCachedDevice.getProfiles().stream().anyMatch(
profile -> profile instanceof VolumeControlProfile);
boolean hasAmbientControl =
mAmbientUiController != null && mAmbientUiController.isAmbientControlAvailable();
if (DEBUG) {
Log.v(TAG, "isAvailable, isHearingDevice=" + isHearingDevice
+ ", supportVcp=" + supportVcp
+ ", hasAmbientControl=" + hasAmbientControl);
}
return isHearingDevice && supportVcp && hasAmbientControl;
}
@Nullable