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

Commit 0a295724 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 am: 1cceacc4 

am: 2c90394b

Change-Id: I8c913dfa6823f9c9cfee1a68a3f61000e5594b57
parents db3cc336 2c90394b

packages/Shell/AndroidManifest.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -207,6 +207,7 @@ 
    <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>

    <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>





    <application android:label="@string/app_label"

    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"

                android:defaultToDeviceProtectedStorage="true"

                android:directBootAware="true">

                android:directBootAware="true">

        <provider

        <provider
@@ -233,7 +234,6 @@ 




        <activity

        <activity

            android:name=".BugreportWarningActivity"

            android:name=".BugreportWarningActivity"

            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"

            android:finishOnCloseSystemDialogs="true"

            android:finishOnCloseSystemDialogs="true"

            android:excludeFromRecents="true"

            android:excludeFromRecents="true"

            android:exported="false" />

            android:exported="false" />

packages/Shell/src/com/android/shell/BugreportProgressService.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -77,6 +77,7 @@ import android.util.Log; 
import android.util.Pair;

import android.util.Pair;

import android.util.Patterns;

import android.util.Patterns;

import android.util.SparseArray;

import android.util.SparseArray;

import android.view.ContextThemeWrapper;

import android.view.IWindowManager;

import android.view.IWindowManager;

import android.view.View;

import android.view.View;

import android.view.View.OnFocusChangeListener;

import android.view.View.OnFocusChangeListener;
@@ -1635,11 +1636,13 @@ public class BugreportProgressService extends Service { 
        void initialize(final Context context, BugreportInfo info) {

        void initialize(final Context context, BugreportInfo info) {

            final String dialogTitle =

            final String dialogTitle =

                    context.getString(R.string.bugreport_info_dialog_title, info.id);

                    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.

            // First initializes singleton.

            if (mDialog == null) {

            if (mDialog == null) {

                @SuppressLint("InflateParams")

                @SuppressLint("InflateParams")

                // It's ok pass null ViewRoot on AlertDialogs.

                // 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);

                mInfoName = (EditText) view.findViewById(R.id.name);

                mInfoTitle = (EditText) view.findViewById(R.id.title);

                mInfoTitle = (EditText) view.findViewById(R.id.title);
@@ -1656,7 +1659,7 @@ public class BugreportProgressService extends Service { 
                    }

                    }

                });

                });





                mDialog = new AlertDialog.Builder(context)

                mDialog = new AlertDialog.Builder(themedContext)

                        .setView(view)

                        .setView(view)

                        .setTitle(dialogTitle)

                        .setTitle(dialogTitle)

                        .setCancelable(true)

                        .setCancelable(true)