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

Commit 02a281d9 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '4023-UI_revamp' into 'master' 

4023-UI_revamp

See merge request e/apps/GmsCore!34
parents 92e921fd a86db33f

Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ LOCAL_MODULE := GmsCore 
LOCAL_MODULE_TAGS := optional

LOCAL_PACKAGE_NAME := GmsCore



LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_STATIC_JAVA_LIBRARIES += org.lineageos.platform.sdk



gmscore_root  := $(LOCAL_PATH)

gmscore_dir   := play-services-core

gmscore_out   := $(TARGET_COMMON_OUT_ROOT)/obj/APPS/$(LOCAL_MODULE)_intermediates

e-ui-sdk.jar

0 → 100644
+113 KiB

File added.

No diff preview for this file type.

View file

firebase-auth-core/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
            android:name="org.microg.gms.firebase.auth.ReCaptchaActivity"

            android:exported="false"

            android:process=":ui"

            android:theme="@style/Theme.AppCompat.Light.Dialog.Alert.NoActionBar" />

            android:theme="@style/Theme.AppCompat.DayNight.Dialog.Alert.NoActionBar" />

    </application>

</manifest>

play-services-base-core-ui/src/main/res/layout/preference_switch_bar.xml

+2 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
        android:paddingLeft="?attr/listPreferredItemPaddingLeft"

        android:paddingEnd="?attr/listPreferredItemPaddingEnd"

        android:paddingRight="?attr/listPreferredItemPaddingRight"

        app:backgroundColorAttr="@{checked ? androidx.appcompat.R.attr.colorControlActivated : (enabled ? androidx.appcompat.R.attr.colorButtonNormal : androidx.appcompat.R.attr.colorControlHighlight)}"

        app:backgroundColorAttr="@{checked ? android.R.attr.colorControlActivated : (enabled ? android.R.attr.colorButtonNormal : android.R.attr.colorControlHighlight)}"

        tools:background="?attr/colorControlActivated">



        <TextView
@@ -57,7 +57,7 @@ 
            android:textColor="?android:attr/textColorPrimaryInverse"

            tools:text="Enabled" />



        <androidx.appcompat.widget.SwitchCompat

        <Switch

            android:id="@+id/switch_widget"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -66,8 +66,6 @@ 
            android:checked="@{checked}"

            android:enabled="@{enabled}"

            app:onCheckedChangeListener="@{(v, newStatus) -> callback.onChecked(newStatus)}"

            app:thumbTint="?android:attr/textColorPrimaryInverse"

            app:trackTint="?android:attr/textColorSecondaryInverse"

            tools:checked="true" />

    </LinearLayout>

</layout>

play-services-base-core-ui/src/main/res/values/themes.xml

+5 −1
Original line number Diff line number Diff line
@@ -5,12 +5,16 @@ 
  -->



<resources>



    <style name="Theme.AppCompat.Light.Dialog.NoActionBar">

        <item name="windowActionBar">false</item>

        <item name="windowNoTitle">true</item>

    </style>



    <style name="Theme.AppCompat.DayNight.Dialog.NoActionBar">

        <item name="windowActionBar">false</item>

        <item name="windowNoTitle">true</item>

    </style>



    <style name="Theme.AppCompat.Light.Dialog.Alert.NoActionBar">

        <item name="windowActionBar">false</item>

        <item name="windowNoTitle">true</item>