diff options
| -rw-r--r-- | packages/PackageInstaller/AndroidManifest.xml | 11 | ||||
| -rw-r--r-- | packages/PackageInstaller/res/values/themes.xml | 9 |
2 files changed, 1 insertions, 19 deletions
diff --git a/packages/PackageInstaller/AndroidManifest.xml b/packages/PackageInstaller/AndroidManifest.xml index 09e0d61010f7..bf69d3ba7603 100644 --- a/packages/PackageInstaller/AndroidManifest.xml +++ b/packages/PackageInstaller/AndroidManifest.xml @@ -45,11 +45,9 @@ <activity android:name=".v2.ui.InstallLaunch" android:configChanges="orientation|keyboardHidden|screenSize" - android:theme="@style/Theme.AlertDialogActivity" android:exported="false"/> <activity android:name=".InstallStart" - android:theme="@style/Theme.AlertDialogActivity" android:exported="true" android:excludeFromRecents="true"> <intent-filter android:priority="1"> @@ -79,14 +77,12 @@ android:exported="false" /> <activity android:name=".DeleteStagedFileOnResult" - android:theme="@style/Theme.AlertDialogActivity.NoActionBar" android:exported="false" /> <activity android:name=".PackageInstallerActivity" android:exported="false" /> <activity android:name=".InstallInstalling" - android:theme="@style/Theme.AlertDialogActivity.NoAnimation" android:exported="false" /> <receiver android:name=".common.InstallEventReceiver" @@ -98,16 +94,13 @@ </receiver> <activity android:name=".InstallSuccess" - android:theme="@style/Theme.AlertDialogActivity.NoAnimation" android:exported="false" /> <activity android:name=".InstallFailed" - android:theme="@style/Theme.AlertDialogActivity.NoAnimation" android:exported="false" /> <activity android:name=".UninstallerActivity" android:configChanges="orientation|keyboardHidden|screenSize" - android:theme="@style/Theme.AlertDialogActivity.NoActionBar" android:excludeFromRecents="true" android:noHistory="true" android:exported="true"> @@ -121,7 +114,6 @@ <activity android:name=".v2.ui.UninstallLaunch" android:configChanges="orientation|keyboardHidden|screenSize" - android:theme="@style/Theme.AlertDialogActivity.NoActionBar" android:excludeFromRecents="true" android:noHistory="true" android:exported="false"> @@ -144,7 +136,6 @@ </receiver> <activity android:name=".UninstallUninstalling" - android:theme="@style/Theme.AlertDialogActivity.NoActionBar" android:excludeFromRecents="true" android:exported="false" /> @@ -171,7 +162,6 @@ <activity android:name=".UnarchiveActivity" android:configChanges="orientation|keyboardHidden|screenSize" - android:theme="@style/Theme.AlertDialogActivity.NoActionBar" android:excludeFromRecents="true" android:noHistory="true" android:exported="true"> @@ -183,7 +173,6 @@ <activity android:name=".UnarchiveErrorActivity" android:configChanges="orientation|keyboardHidden|screenSize" - android:theme="@style/Theme.AlertDialogActivity.NoActionBar" android:excludeFromRecents="true" android:noHistory="true" android:exported="true"> diff --git a/packages/PackageInstaller/res/values/themes.xml b/packages/PackageInstaller/res/values/themes.xml index 9a062295608d..f5af510111cd 100644 --- a/packages/PackageInstaller/res/values/themes.xml +++ b/packages/PackageInstaller/res/values/themes.xml @@ -17,19 +17,12 @@ <resources> - <style name="Theme.AlertDialogActivity.NoAnimation" - parent="@style/Theme.AlertDialogActivity.NoActionBar"> - <item name="android:windowAnimationStyle">@null</item> - </style> - <style name="Theme.AlertDialogActivity" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"> <item name="alertDialogStyle">@style/AlertDialog</item> - </style> - - <style name="Theme.AlertDialogActivity.NoActionBar"> <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> + <item name="android:windowAnimationStyle">@null</item> </style> </resources> |