Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c00b0426 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "migrate-alerdialog-androidx" 

* changes:
  Migrate all AlertDialogs to AndroidX version
  Migrate all AlertDialogs to AndroidX version
parents 70e1ca35 5bd71514

res/values/themes.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<resources>



    <style name="Transparent">

        <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>

        <item name="alertDialogTheme">@style/Theme.AlertDialog</item>

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:windowIsFloating">true</item>
@@ -45,7 +45,7 @@ 


        <item name="preferenceBackgroundColor">@drawable/preference_background</item>



        <!-- For all androidx version of AlertDialogs -->

        <!-- For AndroidX AlertDialog -->

        <item name="alertDialogTheme">@style/Theme.AlertDialog</item>



        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>

src/com/android/settings/AllowBindAppWidgetActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings;



import android.app.AlertDialog;

import android.appwidget.AppWidgetManager;

import android.content.ComponentName;

import android.content.Context;
@@ -33,6 +32,8 @@ import android.widget.CheckBox; 
import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertController;



import androidx.appcompat.app.AlertDialog;



/**

 * This activity is displayed when an app launches the BIND_APPWIDGET intent. This allows apps

 * that don't have the BIND_APPWIDGET permission to bind specific widgets.

src/com/android/settings/BandMode.java

+1 −1
Original line number Diff line number Diff line 
package com.android.settings;



import android.app.Activity;

import android.app.AlertDialog;

import android.content.DialogInterface;

import android.os.AsyncResult;

import android.os.Bundle;
@@ -18,6 +17,7 @@ import android.widget.ListView; 
import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneFactory;



import androidx.appcompat.app.AlertDialog;



/**

 * Radio Band Mode Selection Class

src/com/android/settings/CredentialStorage.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.settings;



import android.app.Activity;

import android.app.AlertDialog;

import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.content.DialogInterface;
@@ -49,6 +48,7 @@ import com.android.settings.vpn2.VpnUtils; 
import java.io.ByteArrayInputStream;

import java.io.IOException;



import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.FragmentActivity;

import sun.security.util.ObjectIdentifier;

import sun.security.x509.AlgorithmId;

src/com/android/settings/EncryptionInterstitial.java

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings; 


import android.accessibilityservice.AccessibilityServiceInfo;

import android.app.Activity;

import android.app.AlertDialog;

import android.app.Dialog;

import android.app.admin.DevicePolicyManager;

import android.content.Context;
@@ -42,6 +41,8 @@ import com.android.setupwizardlib.GlifLayout; 


import java.util.List;



import androidx.appcompat.app.AlertDialog;



public class EncryptionInterstitial extends SettingsActivity {

    private static final String TAG = EncryptionInterstitial.class.getSimpleName();