Skip to content

Commit 1d19b38

Browse files
committed
Use support library for preferences.
Change-Id: I57a28730b3c0547fc5b5045ab4ca99a106965a9d
1 parent 521f6b3 commit 1d19b38

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

app/src/main/java/com/afwsamples/testdpc/policy/UserRestrictionsDisplayFragment.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
import android.content.Context;
5858
import android.os.Bundle;
5959
import android.os.UserManager;
60-
import android.preference.Preference;
61-
import android.preference.PreferenceFragment;
62-
import android.preference.PreferenceScreen;
63-
import android.preference.SwitchPreference;
60+
import android.support.v14.preference.PreferenceFragment;
61+
import android.support.v14.preference.SwitchPreference;
62+
import android.support.v7.preference.Preference;
63+
import android.support.v7.preference.PreferenceScreen;
6464
import android.util.Log;
6565
import android.widget.Toast;
6666

@@ -181,12 +181,16 @@ public static UserRestrictionsDisplayFragment newInstance() {
181181

182182
@Override
183183
public void onCreate(Bundle savedInstanceState) {
184-
super.onCreate(savedInstanceState);
185184
mDevicePolicyManager = (DevicePolicyManager) getActivity().getSystemService(
186185
Context.DEVICE_POLICY_SERVICE);
187186
mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
188187
mAdminComponentName = DeviceAdminReceiver.getComponentName(getActivity());
188+
super.onCreate(savedInstanceState);
189+
getActivity().getActionBar().setTitle(R.string.user_restrictions_management_title);
190+
}
189191

192+
@Override
193+
public void onCreatePreferences(Bundle bundle, String rootkey) {
190194
PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
191195
getActivity());
192196
setPreferenceScreen(preferenceScreen);
@@ -208,7 +212,6 @@ public void onCreate(Bundle savedInstanceState) {
208212
public void onResume() {
209213
super.onResume();
210214
updateAllUserRestrictions();
211-
getActivity().getActionBar().setTitle(R.string.user_restrictions_management_title);
212215
}
213216

214217
@Override

0 commit comments

Comments
 (0)