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

Migrate to use instrumentation classes from settingslib.

Browse Source 
Test: Compiles. Manually tested.
Change-Id: Ie5515bb0fe3e621fc7723a9b04ba23e4bfa9c401
This commit is contained in:
Leif Hendrik Wilden
2018-01-11 10:15:36 -08:00
parent 2ce430afc4
commit 1546cca529
92 changed files with 177 additions and 1250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/DeviceAdminSettings.java
View File

@@ -49,8 +49,9 @@ import android.widget.Switch;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.instrumentation.Instrumentable;
import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.Instrumentable;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import org.xmlpull.v1.XmlPullParserException;
@@ -63,8 +64,7 @@ import java.util.List;
public class DeviceAdminSettings extends ListFragment implements Instrumentable {
static final String TAG = "DeviceAdminSettings";
private final VisibilityLoggerMixin mVisibilityLoggerMixin =
new VisibilityLoggerMixin(getMetricsCategory());
private VisibilityLoggerMixin mVisibilityLoggerMixin;
private DevicePolicyManager mDPM;
private UserManager mUm;
@@ -85,12 +85,6 @@ public class DeviceAdminSettings extends ListFragment implements Instrumentable
}
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
mVisibilityLoggerMixin.onAttach(context);
}
/**
* Internal collection of device admin info objects for all profiles associated with the current
* user.
@@ -121,6 +115,8 @@ public class DeviceAdminSettings extends ListFragment implements Instrumentable
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider());
}
@Override