diff options
| author | Alan Viverette <alanv@google.com> | 2015-05-06 17:25:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 17:25:26 +0000 |
| commit | 809d5d7fbe20e6c84ea19480efa531af765b792b (patch) | |
| tree | 57a99b549d1604441bc236e5982bed5059ed326c /core/res | |
| parent | 4d5c20c613a6716b14bd8ca3f178672c356a89e5 (diff) | |
| parent | b9da280ac20091673878f3c4b04c65d0510ba23d (diff) | |
| download | frameworks_base-809d5d7fbe20e6c84ea19480efa531af765b792b.zip frameworks_base-809d5d7fbe20e6c84ea19480efa531af765b792b.tar.gz frameworks_base-809d5d7fbe20e6c84ea19480efa531af765b792b.tar.bz2 | |
Merge "DayNight theme for framework packages" into mnc-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a162b4a..e3930cd 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2451,7 +2451,8 @@ android:backupAgent="com.android.server.backup.SystemBackupAgent" android:killAfterRestore="false" android:icon="@drawable/ic_launcher_android" - android:supportsRtl="true"> + android:supportsRtl="true" + android:theme="@style/Theme.Material.DayNight.DarkActionBar"> <activity android:name="com.android.internal.app.ChooserActivity" android:theme="@style/Theme.DeviceDefault.Resolver" android:finishOnCloseSystemDialogs="true" @@ -2484,7 +2485,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.Material.DayNight.Dialog" android:label="@string/heavy_weight_switcher_title" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" @@ -2517,7 +2518,7 @@ <activity android:name="android.accounts.ChooseAccountActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@style/Theme.Material.Light.Dialog" + android:theme="@style/Theme.Material.DayNight.Dialog" android:label="@string/choose_account_label" android:process=":ui"> </activity> @@ -2525,14 +2526,14 @@ <activity android:name="android.accounts.ChooseTypeAndAccountActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@style/Theme.Material.Light.Dialog" + android:theme="@style/Theme.Material.DayNight.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.Material.DayNight.Dialog" android:label="@string/choose_account_label" android:process=":ui"> </activity> @@ -2540,19 +2541,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.Material.DayNight.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.Material.DayNight.DialogWhenLarge" android:process=":ui"> </activity> <activity android:name="android.content.SyncActivityTooManyDeletes" - android:theme="@style/Theme.Material.Light.Dialog" + android:theme="@style/Theme.Material.DayNight.Dialog" android:label="@string/sync_too_many_deletes" android:process=":ui"> </activity> @@ -2572,13 +2573,13 @@ </activity> <activity android:name="com.android.internal.app.NetInitiatedActivity" - android:theme="@style/Theme.Material.Light.Dialog.Alert" + android:theme="@style/Theme.Material.DayNight.Dialog.Alert" android:excludeFromRecents="true" android:process=":ui"> </activity> <activity android:name="com.android.internal.app.RestrictionsPinActivity" - android:theme="@style/Theme.Material.Light.Dialog.Alert" + android:theme="@style/Theme.Material.DayNight.Dialog.Alert" android:excludeFromRecents="true" android:windowSoftInputMode="adjustPan" android:process=":ui"> |