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

Commit c43f05e6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Changed themes for core activities" into nyc-mr1-dev

parents a97c9617 7e2657c3

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ public class ChooseTypeAndAccountActivity extends Activity 
     * useless.

     */

    private void setNonLabelThemeAndCallSuperCreate(Bundle savedInstanceState) {

        setTheme(R.style.Theme_Material_Light_Dialog_NoActionBar);

        setTheme(R.style.Theme_DeviceDefault_Light_Dialog_NoActionBar);

        super.onCreate(savedInstanceState);

    }

core/res/AndroidManifest.xml

+11 −11
Original line number Diff line number Diff line
@@ -3117,7 +3117,7 @@ 
                 android:killAfterRestore="false"

                 android:icon="@drawable/ic_launcher_android"

                 android:supportsRtl="true"

                 android:theme="@style/Theme.Material.Light.DarkActionBar"

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

                 android:defaultToDeviceProtectedStorage="true"

                 android:directBootAware="true">

        <activity android:name="com.android.internal.app.ChooserActivity"
@@ -3154,7 +3154,7 @@ 
                android:label="@string/managed_profile_label">

        </activity-alias>

        <activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity"

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

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

                android:label="@string/heavy_weight_switcher_title"

                android:finishOnCloseSystemDialogs="true"

                android:excludeFromRecents="true"
@@ -3187,7 +3187,7 @@ 
        <activity android:name="android.accounts.ChooseAccountActivity"

                android:excludeFromRecents="true"

                android:exported="true"

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

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

                android:label="@string/choose_account_label"

                android:process=":ui">

        </activity>
@@ -3195,14 +3195,14 @@ 
        <activity android:name="android.accounts.ChooseTypeAndAccountActivity"

                android:excludeFromRecents="true"

                android:exported="true"

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

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

                android:label="@string/choose_account_label"

                android:process=":ui">

        </activity>



        <activity android:name="android.accounts.ChooseAccountTypeActivity"

                android:excludeFromRecents="true"

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

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

                android:label="@string/choose_account_label"

                android:process=":ui">

        </activity>
@@ -3210,19 +3210,19 @@ 
        <activity android:name="android.accounts.CantAddAccountActivity"

                android:excludeFromRecents="true"

                android:exported="true"

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

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

                android:process=":ui">

        </activity>



        <activity android:name="android.accounts.GrantCredentialsPermissionActivity"

                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@style/Theme.Material.Light.DialogWhenLarge"

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

                android:process=":ui">

        </activity>



        <activity android:name="android.content.SyncActivityTooManyDeletes"

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

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

               android:label="@string/sync_too_many_deletes"

               android:process=":ui">

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



        <activity android:name="com.android.internal.app.NetInitiatedActivity"

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

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

                android:excludeFromRecents="true"

                android:process=":ui">

        </activity>
@@ -3263,7 +3263,7 @@ 
        <activity android:name="com.android.internal.app.ConfirmUserCreationActivity"

                android:excludeFromRecents="true"

                android:process=":ui"

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

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

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

                <action android:name="android.os.action.CREATE_USER" />

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



        <activity android:name="com.android.internal.app.UnlaunchableAppActivity"

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

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

                android:excludeFromRecents="true"

                android:process=":ui">

        </activity>