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

Commit 87c7abf0 authored by Abhijeet Kaur's avatar Abhijeet Kaur Committed by android-build-merger
Browse files

Merge "Add dark theme for Shell app." into qt-dev

am: 190e99cf

Change-Id: Ie49ffacdf45b5bb30390d1f666ce4976431f935a
parents cd22b37b 190e99cf
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@
    <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>

    <application android:label="@string/app_label"
                android:theme="@android:style/Theme.DeviceDefault.DayNight"
                android:defaultToDeviceProtectedStorage="true"
                android:directBootAware="true">
        <provider
@@ -232,7 +233,6 @@

        <activity
            android:name=".BugreportWarningActivity"
            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
            android:finishOnCloseSystemDialogs="true"
            android:excludeFromRecents="true"
            android:exported="false" />
+5 −2
Original line number Diff line number Diff line
@@ -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)