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

Merge "[Settings] Support master switch of inline toggle of Settings Injection v2"

Browse Source
This commit is contained in:
Jason Chiu
2019-11-25 02:36:09 +00:00
committed by Android (Google) Code Review
parent a6e7aa1237 10e675d6b5
commit bfbb0181a3
5 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
View File

@@ -60,6 +60,7 @@ import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.drawer.ActivityTile;
import com.android.settingslib.drawer.DashboardCategory;
@@ -303,7 +304,7 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
setSwitchEnabled(pref, false);
ThreadUtils.postOnBackgroundThread(() -> {
final Map<String, IContentProvider> providerMap = new ArrayMap<>();
final Bundle result = TileUtils.putBooleanToUri(mContext, uri, providerMap,
final Bundle result = TileUtils.putBooleanToUriAndGetResult(mContext, uri, providerMap,
EXTRA_SWITCH_CHECKED_STATE, checked);
ThreadUtils.postOnMainThread(() -> {
@@ -335,13 +336,19 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
}
private void setSwitchChecked(Preference pref, boolean checked) {
if (pref instanceof SwitchPreference) {
if (pref instanceof MasterSwitchPreference) {
((MasterSwitchPreference) pref).setChecked(checked);
} else if (pref instanceof SwitchPreference) {
((SwitchPreference) pref).setChecked(checked);
}
}
private void setSwitchEnabled(Preference pref, boolean enabled) {
pref.setEnabled(enabled);
if (pref instanceof MasterSwitchPreference) {
((MasterSwitchPreference) pref).setSwitchEnabled(enabled);
} else {
pref.setEnabled(enabled);
}
}
@VisibleForTesting

5
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -38,6 +38,7 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerListHelper;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -453,7 +454,9 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
Preference createPreference(Tile tile) {
return tile instanceof ProviderTile
? new SwitchPreference(getPrefContext())
: new Preference(getPrefContext());
: tile.hasSwitch()
? new MasterSwitchPreference(getPrefContext())
: new Preference(getPrefContext());
}
@VisibleForTesting