Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-28 00:03:58 +00:00
committed by Android (Google) Code Review
parent a97c9617ae 7e2657c303
commit c43f05e669
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/accounts/ChooseTypeAndAccountActivity.java
View File

@@ -399,7 +399,7 @@ public class ChooseTypeAndAccountActivity extends Activity
* useless. * useless.
*/ */
private void setNonLabelThemeAndCallSuperCreate(Bundle savedInstanceState) { private void setNonLabelThemeAndCallSuperCreate(Bundle savedInstanceState) {
setTheme(R.style.Theme_Material_Light_Dialog_NoActionBar); setTheme(R.style.Theme_DeviceDefault_Light_Dialog_NoActionBar);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }

22
core/res/AndroidManifest.xml
View File

@@ -3117,7 +3117,7 @@
android:killAfterRestore="false" android:killAfterRestore="false"
android:icon="@drawable/ic_launcher_android" android:icon="@drawable/ic_launcher_android"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.Material.Light.DarkActionBar" android:theme="@style/Theme.DeviceDefault.Light.DarkActionBar"
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"
android:directBootAware="true"> android:directBootAware="true">
<activity android:name="com.android.internal.app.ChooserActivity" <activity android:name="com.android.internal.app.ChooserActivity"
@@ -3154,7 +3154,7 @@
android:label="@string/managed_profile_label"> android:label="@string/managed_profile_label">
</activity-alias> </activity-alias>
<activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity" <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:label="@string/heavy_weight_switcher_title"
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true" android:excludeFromRecents="true"
@@ -3187,7 +3187,7 @@
<activity android:name="android.accounts.ChooseAccountActivity" <activity android:name="android.accounts.ChooseAccountActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="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:label="@string/choose_account_label"
android:process=":ui"> android:process=":ui">
</activity> </activity>
@@ -3195,14 +3195,14 @@
<activity android:name="android.accounts.ChooseTypeAndAccountActivity" <activity android:name="android.accounts.ChooseTypeAndAccountActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="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:label="@string/choose_account_label"
android:process=":ui"> android:process=":ui">
</activity> </activity>
<activity android:name="android.accounts.ChooseAccountTypeActivity" <activity android:name="android.accounts.ChooseAccountTypeActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:theme="@style/Theme.Material.Light.Dialog" android:theme="@style/Theme.DeviceDefault.Light.Dialog"
android:label="@string/choose_account_label" android:label="@string/choose_account_label"
android:process=":ui"> android:process=":ui">
</activity> </activity>
@@ -3210,19 +3210,19 @@
<activity android:name="android.accounts.CantAddAccountActivity" <activity android:name="android.accounts.CantAddAccountActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:theme="@style/Theme.Material.Light.Dialog.NoActionBar" android:theme="@style/Theme.DeviceDefault.Light.Dialog.NoActionBar"
android:process=":ui"> android:process=":ui">
</activity> </activity>
<activity android:name="android.accounts.GrantCredentialsPermissionActivity" <activity android:name="android.accounts.GrantCredentialsPermissionActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:theme="@style/Theme.Material.Light.DialogWhenLarge" android:theme="@style/Theme.DeviceDefault.Light.DialogWhenLarge"
android:process=":ui"> android:process=":ui">
</activity> </activity>
<activity android:name="android.content.SyncActivityTooManyDeletes" <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:label="@string/sync_too_many_deletes"
android:process=":ui"> android:process=":ui">
</activity> </activity>
@@ -3242,7 +3242,7 @@
</activity> </activity>
<activity android:name="com.android.internal.app.NetInitiatedActivity" <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:excludeFromRecents="true"
android:process=":ui"> android:process=":ui">
</activity> </activity>
@@ -3263,7 +3263,7 @@
<activity android:name="com.android.internal.app.ConfirmUserCreationActivity" <activity android:name="com.android.internal.app.ConfirmUserCreationActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:process=":ui" android:process=":ui"
android:theme="@style/Theme.Material.Light.Dialog.Alert"> android:theme="@style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter android:priority="1000"> <intent-filter android:priority="1000">
<action android:name="android.os.action.CREATE_USER" /> <action android:name="android.os.action.CREATE_USER" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -3271,7 +3271,7 @@
</activity> </activity>
<activity android:name="com.android.internal.app.UnlaunchableAppActivity" <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:excludeFromRecents="true"
android:process=":ui"> android:process=":ui">
</activity> </activity>