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

Merge "Revert "Migrate to use instrumentation classes from settingslib.""

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-23 01:58:18 +00:00
committed by Android (Google) Code Review
parent 27b2aa35f8 cab0ee611d
commit e3f187a4a9
92 changed files with 1249 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/AbstractZenModePreferenceController.java
View File

@@ -34,9 +34,9 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;

4
src/com/android/settings/notification/ZenRulePreference.java
View File

@@ -30,10 +30,10 @@ import android.view.View;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.utils.ManagedServiceSettings;
import com.android.settings.utils.ZenServiceListing;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.Map;
@@ -145,4 +145,4 @@ public class ZenRulePreference extends TwoTargetPreference {
? mContext.getResources().getString(R.string.switch_off_text)
: mContext.getResources().getString(R.string.switch_on_text);
}
}
}