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

Commit 98236b38 authored by Jason Long's avatar Jason Long Committed by Android Git Automerger
Browse files

am 91c5480e: am e3d7fc4b: Merge "Switched Holo to Material for account chooser... 

am 91c5480e: am e3d7fc4b: Merge "Switched Holo to Material for account chooser activities." into lmp-dev

* commit '91c5480ee6de8f3f740708e71d5be355e2c04266':
  Switched Holo to Material for account chooser activities.
parents 18b6790b d7aa76ae

core/res/AndroidManifest.xml

+9 −9
Original line number Diff line number Diff line
@@ -2856,7 +2856,7 @@ 
        <activity android:name="android.accounts.ChooseAccountActivity"

                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@android:style/Theme.Holo.Dialog"

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

                android:label="@string/choose_account_label"

                android:process=":ui">

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

                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@android:style/Theme.Holo.Dialog"

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

                android:label="@string/choose_account_label"

                android:process=":ui">

        </activity>



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

                android:excludeFromRecents="true"

                android:theme="@android:style/Theme.Holo.Dialog"

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

                android:label="@string/choose_account_label"

                android:process=":ui">

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

                android:excludeFromRecents="true"

                android:exported="true"

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

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

                android:process=":ui">

        </activity>



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

                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@android:style/Theme.Holo.DialogWhenLarge"

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

                android:process=":ui">

        </activity>