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

Commit d3505c76 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Change dialog theme for dialog activity."

parents 6075d46e 71a05741

AndroidManifest.xml

+7 −7
Original line number Original line Diff line number Diff line
@@ -692,7 +692,7 @@ 




        <activity android:name=".inputmethod.UserDictionaryAddWordActivity"

        <activity android:name=".inputmethod.UserDictionaryAddWordActivity"

                  android:label="@string/user_dict_settings_title"

                  android:label="@string/user_dict_settings_title"

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

                  android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

                  android:windowSoftInputMode="stateVisible"

                  android:windowSoftInputMode="stateVisible"

                  android:noHistory="true"

                  android:noHistory="true"

                  android:excludeFromRecents="true">

                  android:excludeFromRecents="true">
@@ -1186,7 +1186,7 @@ 
        </activity>

        </activity>





        <activity android:name=".notification.ZenModeVoiceActivity"

        <activity android:name=".notification.ZenModeVoiceActivity"

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

                android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

                android:label="@string/zen_mode_settings_title">

                android:label="@string/zen_mode_settings_title">

            <intent-filter>

            <intent-filter>

                <action android:name="android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE" />

                <action android:name="android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE" />
@@ -1965,7 +1965,7 @@ 




        <activity android:name=".bluetooth.BluetoothPairingDialog"

        <activity android:name=".bluetooth.BluetoothPairingDialog"

                  android:excludeFromRecents="true"

                  android:excludeFromRecents="true"

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

                  android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">

            <intent-filter android:priority="1">

            <intent-filter android:priority="1">

                <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />

                <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -1997,14 +1997,14 @@ 
                  android:excludeFromRecents="true"

                  android:excludeFromRecents="true"

                  android:exported="true"

                  android:exported="true"

                  android:permission="android.permission.MANAGE_USB"

                  android:permission="android.permission.MANAGE_USB"

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

                  android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">

        </activity>

        </activity>





        <activity android:name=".RemoteBugreportActivity"

        <activity android:name=".RemoteBugreportActivity"

                  android:excludeFromRecents="true"

                  android:excludeFromRecents="true"

                  android:exported="true"

                  android:exported="true"

                  android:permission="android.permission.DUMP"

                  android:permission="android.permission.DUMP"

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

                  android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">

            <intent-filter>

            <intent-filter>

                <action android:name="android.settings.SHOW_REMOTE_BUGREPORT_DIALOG" />

                <action android:name="android.settings.SHOW_REMOTE_BUGREPORT_DIALOG" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -2734,7 +2734,7 @@ 
        </activity>

        </activity>





        <activity android:name=".sim.SimPreferenceDialog"

        <activity android:name=".sim.SimPreferenceDialog"

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

            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

            android:excludeFromRecents="true">

            android:excludeFromRecents="true">

        </activity>

        </activity>
@@ -2763,7 +2763,7 @@ 
        </activity>

        </activity>





        <activity android:name=".sim.SimDialogActivity"

        <activity android:name=".sim.SimDialogActivity"

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

                android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

                android:label="@string/sim_settings_title"

                android:label="@string/sim_settings_title"

                android:excludeFromRecents="true">

                android:excludeFromRecents="true">

            <intent-filter>

            <intent-filter>