From 8549ccf69b7221a75f11d040b7de4a93a700a1ba Mon Sep 17 00:00:00 2001 From: Abhijeet Kaur Date: Wed, 22 May 2019 18:47:49 +0100 Subject: Add dark theme for Shell app. Bugreport info dialog is used in the BugreportProgressService; services are not themeable from the manifest file. Added themed context wrapper in the service file. Text view underlines are no longer black, and are white in color. Bug: 128364209 Test: build and flash to device, manually verified the color of the dialog Change-Id: Ia42c1c7c2b6f2e30d91a5522f1d6b3507b032cdb --- packages/Shell/src/com/android/shell/BugreportProgressService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages/Shell/src') diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 1060c7b7ce79..e57a5ded0698 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -99,6 +99,7 @@ import android.util.Log; import android.util.Pair; import android.util.Patterns; import android.util.SparseArray; +import android.view.ContextThemeWrapper; import android.view.IWindowManager; import android.view.View; import android.view.WindowManager; @@ -1467,11 +1468,13 @@ public class BugreportProgressService extends Service { void initialize(final Context context, BugreportInfo info) { final String dialogTitle = context.getString(R.string.bugreport_info_dialog_title, info.id); + final Context themedContext = new ContextThemeWrapper( + context, com.android.internal.R.style.Theme_DeviceDefault_DayNight); // First initializes singleton. if (mDialog == null) { @SuppressLint("InflateParams") // It's ok pass null ViewRoot on AlertDialogs. - final View view = View.inflate(context, R.layout.dialog_bugreport_info, null); + final View view = View.inflate(themedContext, R.layout.dialog_bugreport_info, null); mInfoName = (EditText) view.findViewById(R.id.name); mInfoTitle = (EditText) view.findViewById(R.id.title); @@ -1488,7 +1491,7 @@ public class BugreportProgressService extends Service { } }); - mDialog = new AlertDialog.Builder(context) + mDialog = new AlertDialog.Builder(themedContext) .setView(view) .setTitle(dialogTitle) .setCancelable(true) -- cgit v1.2.3-59-g8ed1b