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

Update DialogFragment UI when BT device is add/remove/rename

Browse Source 
* For fix the "Automatic merge failed" in pi-dev, cherry pick the ag/3937781 in
  master. Change android.support.* to androidx.*
* Add AudioSwitchCallback() in AudioSwitchPreferenceController.
  This callback is used to notify SoudSettings to update the dialogFragment UI.
* Add UpdatableListPreferenceDialogFragment that updates the available
  options when dialog is shown
* Add test to verify the adapter count when
  onListPreferenceUpdated() is called.

Bug: 77783217
Test: make -j50 RunSettingsRoboTests
Change-Id: I8cac1b30ec50df026f4b7722dd1cd2f69e77a4cb
This commit is contained in:
hughchen
2018-04-23 20:13:14 +08:00
parent 82e7aa8975
commit acb6e89c52
6 changed files with 319 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/com/android/settings/notification/SoundSettings.java
View File

@@ -25,17 +25,24 @@ import android.os.Message;
import android.os.UserHandle;
import android.preference.SeekBarVolumizer;
import android.provider.SearchIndexableResource;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.RingtonePreference;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.sound.HandsFreeProfileOutputPreferenceController;
import com.android.settings.sound.MediaOutputPreferenceController;
import com.android.settings.widget.PreferenceCategoryController;
import com.android.settings.widget.UpdatableListPreferenceDialogFragment;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.Instrumentable;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
@@ -71,6 +78,9 @@ public class SoundSettings extends DashboardFragment {
};
private RingtonePreference mRequestPreference;
private UpdatableListPreferenceDialogFragment mDialogFragment;
private String mMediaOutputControllerKey;
private String mHfpOutputControllerKey;
@Override
public int getMetricsCategory() {
@@ -85,6 +95,11 @@ public class SoundSettings extends DashboardFragment {
if (!TextUtils.isEmpty(selectedPreference)) {
mRequestPreference = (RingtonePreference) findPreference(selectedPreference);
}
UpdatableListPreferenceDialogFragment dialogFragment =
(UpdatableListPreferenceDialogFragment) getFragmentManager()
.findFragmentByTag(TAG);
mDialogFragment = dialogFragment;
}
}
@@ -114,6 +129,23 @@ public class SoundSettings extends DashboardFragment {
return super.onPreferenceTreeClick(preference);
}
@Override
public void onDisplayPreferenceDialog(Preference preference) {
final int metricsCategory;
if (mHfpOutputControllerKey.equals(preference.getKey())) {
metricsCategory = MetricsProto.MetricsEvent.DIALOG_SWITCH_HFP_DEVICES;
} else if (mMediaOutputControllerKey.equals(preference.getKey())) {
metricsCategory = MetricsProto.MetricsEvent.DIALOG_SWITCH_A2DP_DEVICES;
} else {
metricsCategory = Instrumentable.METRICS_CATEGORY_UNKNOWN;
}
mDialogFragment = UpdatableListPreferenceDialogFragment.
newInstance(preference.getKey(), metricsCategory);
mDialogFragment.setTargetFragment(this, 0);
mDialogFragment.show(getFragmentManager(), TAG);
}
@Override
protected String getLogTag() {
return TAG;
@@ -155,6 +187,14 @@ public class SoundSettings extends DashboardFragment {
volumeControllers.add(use(NotificationVolumePreferenceController.class));
volumeControllers.add(use(CallVolumePreferenceController.class));
use(MediaOutputPreferenceController.class).setCallback(listPreference ->
onPreferenceDataChanged(listPreference));
mMediaOutputControllerKey = use(MediaOutputPreferenceController.class).getPreferenceKey();
use(HandsFreeProfileOutputPreferenceController.class).setCallback(listPreference ->
onPreferenceDataChanged(listPreference));
mHfpOutputControllerKey =
use(HandsFreeProfileOutputPreferenceController.class).getPreferenceKey();
for (VolumeSeekBarPreferenceController controller : volumeControllers) {
controller.setCallback(mVolumeCallback);
getLifecycle().addObserver(controller);
@@ -291,4 +331,10 @@ public class SoundSettings extends DashboardFragment {
workSoundController.enableWorkSync();
}
}
}
private void onPreferenceDataChanged(ListPreference preference) {
if (mDialogFragment != null) {
mDialogFragment.onListPreferenceUpdated(preference);
}
}
}