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

Merge changes from topic "migrate-alerdialog-androidx"

Browse Source 
* changes:
  Migrate all AlertDialogs to AndroidX version
  Migrate all AlertDialogs to AndroidX version
This commit is contained in:
Fan Zhang
2018-07-20 21:52:06 +00:00
committed by Android (Google) Code Review
parent 70e1ca3599 5bd7151413
commit c00b042678
136 changed files with 304 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/dashboard/RestrictedDashboardFragment.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.dashboard;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -37,6 +36,8 @@ import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtils;
import androidx.appcompat.app.AlertDialog;
/**
* Base class for settings screens that should be pin protected when in restricted mode or
* that will display an admin support message in case an admin has disabled the options.