Merge branch '6112-r-fix-login-activity-theming' into 'master'

Fix LoginActivity theming See merge request e/os/GmsCore!50
microg · Oct 13, 2022 · 92260c0 · 92260c0
2 parents c9b4c8f + 8144e9f
commit 92260c0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
@@ -369,8 +369,7 @@
             android:name="org.microg.gms.auth.login.LoginActivity"
             android:configChanges="keyboardHidden|keyboard|orientation|screenSize"
             android:exported="true"
-            android:process=":ui"
-            android:theme="@style/Theme.LoginBlue">
+            android:process=":ui">
             <intent-filter>
                 <action android:name="com.google.android.gms.auth.login.LOGIN" />
 

diff --git a/play-services-core/src/main/res/values/themes.xml b/play-services-core/src/main/res/values/themes.xml
@@ -44,11 +44,6 @@
         <item name="android:divider">@color/divider_color</item>
     </style>
 
-    <style name="Theme.LoginBlue" parent="AppTheme">
-        <item name="android:windowNoTitle">true</item>
-        <item name="windowActionBar">false</item>
-    </style>
-
     <style name="customToolbarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
         <item name="colorControlNormal">@color/settings_theme_accent</item>
         <item name="android:textColorPrimary">@color/primary_text_color</item>