diff options
4 files changed, 9 insertions, 3 deletions
diff --git a/WifiDialog/src/com/android/wifi/dialog/WifiDialogActivity.java b/WifiDialog/src/com/android/wifi/dialog/WifiDialogActivity.java index 786741c361..b73bee04be 100644 --- a/WifiDialog/src/com/android/wifi/dialog/WifiDialogActivity.java +++ b/WifiDialog/src/com/android/wifi/dialog/WifiDialogActivity.java @@ -501,7 +501,8 @@ public class WifiDialogActivity extends Activity { Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); } } - AlertDialog dialog = new AlertDialog.Builder(this) + AlertDialog dialog = new AlertDialog.Builder( + new ContextThemeWrapper(this, getStyleId("wifi_dialog"))) .setTitle(title) .setMessage(spannableMessage) .setPositiveButton(positiveButtonText, (dialogPositive, which) -> { @@ -578,7 +579,8 @@ public class WifiDialogActivity extends Activity { addRowToP2pDialog(group, getStringId("wifi_p2p_show_pin_message"), displayPin); } - AlertDialog dialog = new AlertDialog.Builder(this) + AlertDialog dialog = new AlertDialog.Builder( + new ContextThemeWrapper(this, getStyleId("wifi_dialog"))) .setTitle(getString(getStringId("wifi_p2p_invitation_sent_title"))) .setView(textEntryView) .setPositiveButton(getStringId("ok"), (dialogPositive, which) -> { diff --git a/service/ServiceWifiResources/res/values/overlayable.xml b/service/ServiceWifiResources/res/values/overlayable.xml index 56d0e5e6c9..019063b6d2 100644 --- a/service/ServiceWifiResources/res/values/overlayable.xml +++ b/service/ServiceWifiResources/res/values/overlayable.xml @@ -395,6 +395,7 @@ <item type="style" name="wifi_item_label" /> <item type="style" name="wifi_item_content" /> <item type="style" name="wifi_section" /> + <item type="style" name="wifi_dialog" /> <item type="style" name="wifi_p2p_invitation_received_dialog" /> <item type="style" name="wifi_p2p_dialog_row_label" /> <item type="style" name="wifi_p2p_dialog_row_content" /> diff --git a/service/ServiceWifiResources/res/values/styles.xml b/service/ServiceWifiResources/res/values/styles.xml index 872616d0f8..f995441a9f 100644 --- a/service/ServiceWifiResources/res/values/styles.xml +++ b/service/ServiceWifiResources/res/values/styles.xml @@ -43,6 +43,7 @@ <item name="android:orientation">vertical</item> </style> + <style name="wifi_dialog" /> <style name="wifi_p2p_invitation_received_dialog" /> <style name="wifi_p2p_dialog_row_label" parent="@style/wifi_item_label" /> diff --git a/service/java/com/android/server/wifi/WifiDialogManager.java b/service/java/com/android/server/wifi/WifiDialogManager.java index 6bd381e90f..f4091f5fae 100644 --- a/service/java/com/android/server/wifi/WifiDialogManager.java +++ b/service/java/com/android/server/wifi/WifiDialogManager.java @@ -35,6 +35,7 @@ import android.text.style.URLSpan; import android.util.ArraySet; import android.util.Log; import android.util.SparseArray; +import android.view.ContextThemeWrapper; import android.view.Display; import android.view.Gravity; import android.view.View; @@ -507,7 +508,8 @@ public class WifiDialogManager { mTimeoutRunnable = null; } mTimeoutMs = timeoutMs; - mAlertDialog = mFrameworkFacade.makeAlertDialogBuilder(mContext) + mAlertDialog = mFrameworkFacade.makeAlertDialogBuilder( + new ContextThemeWrapper(mContext, R.style.wifi_dialog)) .setTitle(mTitle) .setMessage(mMessage) .setPositiveButton(mPositiveButtonText, (dialogPositive, which) -> { |