From 9259c6f23fa17bcc12c137398735fcb1f1f2b997 Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Tue, 20 Feb 2024 12:17:35 +0100 Subject: [PATCH 1/2] Apply /e/OS patch --- .gitignore | 9 +- .gitlab-ci.yml | 78 +++++++++ Android.mk | 6 +- build.gradle | 5 +- .../core/src/main/AndroidManifest.xml | 2 +- gradle.properties | 2 +- .../src/main/res/drawable/ic_info_outline.xml | 2 +- .../core/src/main/res/values/themes.xml | 7 +- play-services-core/build.gradle | 47 ++++++ .../microg-ui-tools/build.gradle | 1 + .../tools/ui/AbstractSettingsActivity.java | 8 +- .../res/drawable-v21/switchbar_background.xml | 2 +- .../src/main/res/drawable/ic_arrow_back.xml | 17 ++ .../src/main/res/drawable/ic_expand_less.xml | 2 +- .../src/main/res/drawable/ic_expand_more.xml | 2 +- .../res/drawable/switchbar_background.xml | 2 +- .../src/main/res/layout/about_root.xml | 15 +- .../src/main/res/layout/app_bar.xml | 3 +- .../src/main/res/layout/condition_card.xml | 14 +- .../src/main/res/layout/self_check_entry.xml | 1 + .../src/main/res/layout/settings_activity.xml | 2 +- .../src/main/res/layout/switch_bar.xml | 3 +- .../src/main/res/values/colors.xml | 71 +++++++- .../src/main/AndroidManifest.xml | 30 +--- .../microg/gms/ui/PlacePickerActivity.java | 2 +- .../org/microg/gms/ui/SettingsFragment.kt | 10 ++ .../src/main/res/drawable/ic_add_account.xml | 2 +- .../src/main/res/drawable/ic_arrow_back.xml | 17 ++ .../src/main/res/drawable/ic_certificate.xml | 2 +- .../src/main/res/drawable/ic_cloud_bell.xml | 2 +- .../src/main/res/drawable/ic_device_login.xml | 2 +- .../main/res/drawable/ic_manage_accounts.xml | 2 +- .../src/main/res/drawable/ic_map_marker.xml | 2 +- .../src/main/res/drawable/ic_shop.xml | 2 +- .../src/main/res/layout/ask_gcm.xml | 4 +- .../src/main/res/layout/ask_permission.xml | 7 +- .../res/layout/ask_permission_list_entry.xml | 4 + .../src/main/res/layout/games_info.xml | 3 +- .../src/main/res/layout/login_assistant.xml | 11 +- .../res/layout/login_assistant_loading.xml | 1 + .../src/main/res/layout/pick_place.xml | 6 +- .../res/layout/settings_root_activity.xml | 2 + .../src/main/res/layout/toolbar.xml | 5 +- .../src/main/res/values-night-v23/themes.xml | 25 +++ .../src/main/res/values-night-v31/themes.xml | 2 +- .../src/main/res/values-night-v8/themes.xml | 110 ------------ .../src/main/res/values-v23/themes.xml | 39 ++--- .../src/main/res/values-v27/themes.xml | 15 -- .../src/main/res/values-v31/themes.xml | 4 - .../src/main/res/values/bools.xml | 1 + .../src/main/res/values/colors.xml | 20 ++- .../src/main/res/values/e_strings.xml | 28 ++++ .../src/main/res/values/themes.xml | 158 +++--------------- .../src/main/res/xml/authenticator.xml | 2 +- .../src/main/res/xml/preferences_accounts.xml | 8 +- .../main/res/xml/preferences_gcm_advanced.xml | 2 +- .../main/res/xml/preferences_google_more.xml | 14 +- .../preferences_push_notifications_app.xml | 4 +- .../src/main/res/xml/preferences_vending.xml | 4 +- .../ui/LocationPreferencesFragment.kt | 2 +- .../core/src/main/res/values/themes.xml | 14 ++ .../src/main/res/xml/preferences_location.xml | 14 +- .../xml/preferences_location_app_details.xml | 4 +- play-services-maps/core/mapbox/build.gradle | 13 ++ .../org/microg/gms/maps/mapbox/GoogleMap.kt | 1 + play-services-maps/core/vtm/build.gradle | 15 ++ ...xposure_notifications_confirm_activity.xml | 8 +- settings.gradle | 3 + vending-app/build.gradle | 2 + vending-app/src/main/AndroidManifest.xml | 8 + .../protocol/ISplitInstallService.aidl | 29 ++++ .../ISplitInstallServiceCallback.aidl | 37 ++++ .../e/apps/ISplitInstallService.aidl | 11 ++ .../android/vending/SplitInstallService.kt | 99 +++++++++++ .../splitinstall/SplitInstallErrorCode.kt | 13 ++ .../vending/splitinstall/SplitInstaller.kt | 30 ++++ .../installer/AppLoungeSplitInstaller.kt | 73 ++++++++ .../src/main/res/values-de/strings.xml | 2 +- .../src/main/res/values-es/strings.xml | 2 +- .../src/main/res/values-fr/strings.xml | 4 +- .../src/main/res/values-it/strings.xml | 2 +- .../src/main/res/values-sv/strings.xml | 2 +- 82 files changed, 822 insertions(+), 419 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 play-services-core/microg-ui-tools/src/main/res/drawable/ic_arrow_back.xml create mode 100644 play-services-core/src/main/res/drawable/ic_arrow_back.xml rename play-services-core/{microg-ui-tools => }/src/main/res/layout/toolbar.xml (85%) create mode 100644 play-services-core/src/main/res/values-night-v23/themes.xml delete mode 100644 play-services-core/src/main/res/values-night-v8/themes.xml delete mode 100644 play-services-core/src/main/res/values-v27/themes.xml delete mode 100644 play-services-core/src/main/res/values-v31/themes.xml create mode 100644 play-services-core/src/main/res/values/e_strings.xml create mode 100644 play-services-location/core/src/main/res/values/themes.xml create mode 100644 vending-app/src/main/aidl/com/google/android/play/core/splitinstall/protocol/ISplitInstallService.aidl create mode 100644 vending-app/src/main/aidl/com/google/android/play/core/splitinstall/protocol/ISplitInstallServiceCallback.aidl create mode 100644 vending-app/src/main/aidl/foundation/e/apps/ISplitInstallService.aidl create mode 100644 vending-app/src/main/java/com/android/vending/SplitInstallService.kt create mode 100644 vending-app/src/main/java/com/android/vending/splitinstall/SplitInstallErrorCode.kt create mode 100644 vending-app/src/main/java/com/android/vending/splitinstall/SplitInstaller.kt create mode 100644 vending-app/src/main/java/com/android/vending/splitinstall/installer/AppLoungeSplitInstaller.kt diff --git a/.gitignore b/.gitignore index 8db18dfef..082b1d9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,11 @@ bin/ build/ .gradle/ .idea/ -user.gradle local.properties .directory - -.settings -.classpath +bin/ .project +.classpath +.output/ +.settings/ +*keystore diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..47e7d8cf4 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,78 @@ +image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest" + +stages: +- build +- publish + +variables: + GIT_SUBMODULE_STRATEGY: recursive + +before_script: +- if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi +- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' +- eval $(ssh-agent -s) +- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null +- mkdir -p ~/.ssh +- chmod 700 ~/.ssh +- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts +- chmod 644 ~/.ssh/known_hosts +- export GRADLE_USER_HOME=$(pwd)/.gradle +- chmod +x ./gradlew + +.default_before_script: &default_before_script + - echo sdk.dir $ANDROID_HOME > local.properties + - echo mapbox.key $MAPBOX_KEY >> local.properties + - echo mapbox.enabled true >> local.properties + - echo ichnaea.key $ICHNAEA_KEY >> local.properties + - echo stadia.key $STADIA_KEY >> local.properties + - echo modules.hms false >> local.properties + - echo "${KEYSTORE}" | base64 -d > play-services-core/e.keystore + - export TERM=dumb + - export JAVA_OPTS="-XX:+HeapDumpOnOutOfMemoryError -Xmx4096m" + +cache: + key: ${CI_PROJECT_ID} + paths: + - .gradle/ + +build: + stage: build + rules: + - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true" + - when: always + before_script: + - *default_before_script + - echo modules.nearby false >> local.properties + script: + - ./gradlew assembleDebug + - ./gradlew assembleRelease + artifacts: + paths: + - play-services-core/build/outputs/apk/ + - vending-app/build/outputs/apk/ + +build-nearby: + extends: build + stage: build + rules: + - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true" + - when: always + before_script: + - *default_before_script + - echo modules.nearby true >> local.properties + script: + - ./gradlew assembleDebug + - ./gradlew assembleRelease + +publish: + stage: publish + rules: + - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true" + when: manual + script: + - | + curl --fail --output "/dev/null" --silent --show-error \ + --header 'Content-Type: application/json' --header "PRIVATE-TOKEN: ${PUBLICATION_TOKEN}" \ + --data "{\"ref\":\"${CI_COMMIT_SHA}\",\"name\":\"${CI_COMMIT_TAG}\",\"tag_name\":\"${CI_COMMIT_TAG}\",\"description\":\"${CI_COMMIT_TITLE}\",\"assets\":{\"links\":[{\"name\":\"GmsCore-test.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseTest/play-services-core-withMapbox-withNearby-releaseTest.apk?job=build-nearby\",\"link_type\":\"package\"},{\"name\":\"GmsCore-dev.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseDev/play-services-core-mapbox-default-releaseDev.apk?job=build-nearby\",\"link_type\":\"package\"},{\"name\":\"GmsCore-stable.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseStable/play-services-core-mapbox-default-releaseStable.apk?job=build-nearby\",\"link_type\":\"package\"}]}}" \ + --request POST https://gitlab.e.foundation/api/v4/projects/149/releases + diff --git a/Android.mk b/Android.mk index 5cd016987..3c1a249dc 100644 --- a/Android.mk +++ b/Android.mk @@ -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 @@ -38,4 +42,4 @@ LOCAL_SRC_FILES := $(gmscore_apk) LOCAL_MODULE_CLASS := APPS LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -include $(BUILD_PREBUILT) +include $(BUILD_PREBUILT) \ No newline at end of file diff --git a/build.gradle b/build.gradle index f1f83dc9c..24e0d8d9a 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ buildscript { ext.androidBuildVersionTools = '34.0.0' - ext.androidMinSdk = 19 + ext.androidMinSdk = 21 ext.androidTargetSdk = 29 ext.androidCompileSdk = 34 @@ -54,6 +54,7 @@ buildscript { repositories { mavenCentral() google() + maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'} } dependencies { @@ -118,7 +119,7 @@ subprojects { repositories { mavenCentral() google() + maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'} if (hasModule("hms", false)) maven {url 'https://developer.huawei.com/repo/'} } } - diff --git a/firebase-auth/core/src/main/AndroidManifest.xml b/firebase-auth/core/src/main/AndroidManifest.xml index b684a0c29..4d28aa037 100644 --- a/firebase-auth/core/src/main/AndroidManifest.xml +++ b/firebase-auth/core/src/main/AndroidManifest.xml @@ -19,6 +19,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" /> diff --git a/gradle.properties b/gradle.properties index c1cbc518a..04b4aa358 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ android.useAndroidX=true -org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED +org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED diff --git a/play-services-base/core/src/main/res/drawable/ic_info_outline.xml b/play-services-base/core/src/main/res/drawable/ic_info_outline.xml index 093c73f6f..0850eaa3a 100644 --- a/play-services-base/core/src/main/res/drawable/ic_info_outline.xml +++ b/play-services-base/core/src/main/res/drawable/ic_info_outline.xml @@ -8,7 +8,7 @@ - + + - diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index a2bdcd4a8..de0e9f540 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -90,6 +90,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion" + implementation 'foundation.e:elib:0.0.1-alpha11' } android { @@ -138,11 +139,57 @@ android { disable 'MissingTranslation', 'GetLocales', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'UniquePermission' } + signingConfigs { + + def keystore_password = System.getenv('KEYSTORE_PASSWORD') + + releaseTest { + storeFile file("e.keystore") + storePassword keystore_password + keyAlias 'platform.test' + keyPassword keystore_password + } + + releaseDev { + storeFile file("e.keystore") + storePassword keystore_password + keyAlias 'platform.dev' + keyPassword keystore_password + } + + releaseStable { + storeFile file("e.keystore") + storePassword keystore_password + keyAlias 'platform.stable' + keyPassword keystore_password + } + } + + buildTypes { + release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + + releaseTest { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.releaseTest + } + + releaseDev { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.releaseDev + } + + releaseStable { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.releaseStable + } } flavorDimensions = ['maps', 'target'] diff --git a/play-services-core/microg-ui-tools/build.gradle b/play-services-core/microg-ui-tools/build.gradle index 05126d0ab..9f04d075f 100644 --- a/play-services-core/microg-ui-tools/build.gradle +++ b/play-services-core/microg-ui-tools/build.gradle @@ -42,5 +42,6 @@ android { dependencies { implementation "androidx.appcompat:appcompat:$appcompatVersion" implementation "androidx.preference:preference:$preferenceVersion" + implementation "foundation.e:elib:0.0.1-alpha11" } diff --git a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java index 5450a7e21..b056e697c 100644 --- a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java +++ b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSettingsActivity.java @@ -24,11 +24,15 @@ public abstract class AbstractSettingsActivity extends AppCompatActivity { if (showHomeAsUp) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayShowHomeEnabled(true); + + getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_arrow_back); } - switchBar = (SwitchBar) findViewById(R.id.switch_bar); + switchBar = findViewById(R.id.switch_bar); - customBarContainer = (ViewGroup) findViewById(R.id.custom_bar); + customBarContainer = findViewById(R.id.custom_bar); if (customBarLayout != 0) { customBarContainer.addView(getLayoutInflater().inflate(customBarLayout, customBarContainer, false)); } diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml b/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml index 20909c3aa..c900528a0 100644 --- a/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml +++ b/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml @@ -1,6 +1,6 @@ - + diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_arrow_back.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_arrow_back.xml new file mode 100644 index 000000000..1af4469d9 --- /dev/null +++ b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_arrow_back.xml @@ -0,0 +1,17 @@ + + + + + + diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml index 62ff063e3..ad5667f92 100644 --- a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml +++ b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml @@ -19,7 +19,7 @@ diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml index 871f6575e..7a0f48df3 100644 --- a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml +++ b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml @@ -19,7 +19,7 @@ diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml index 9c5aba9c5..c70518bb4 100644 --- a/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml +++ b/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml @@ -16,5 +16,5 @@ --> + android:color="?attr/colorPrimaryDark"/> diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml b/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml index 183431063..d0e3bad4d 100644 --- a/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml +++ b/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml @@ -1,5 +1,4 @@ - - - #ff263238 - #ff21272b - #ff009688 + @color/e_action_bar + @color/e_action_bar + @color/e_accent - #ff37474f - #ff7fcac3 + @color/e_background + @color/e_floating_background + @color/e_primary_text_color + @color/e_secondary_text_color + @color/e_divider_color + @color/e_background + + @color/e_divider_color + @color/e_error + + @color/e_accent + @color/e_action_bar + + #ff410e0b + #ffffffff + #ff601410 + #ff8c1d18 + #ffb3261e + #ffe46962 + #fff2b8b5 + #fff9dedc + #ff474747 + #ff757575 + #ff1f1f1f + #ffffffff + #ff303030 + #ff131314 + #ffe3e3e3 + #fff2f2f2 + #ff2d312f + #ff444746 + #ff5c5f5e + #ff747775 + #ff8e918f + #ffa9acaa + #ffc4c7c5 + #ffe1e3e1 + #ff041e49 + #ffffffff + #ff062e6f + #ff0842a0 + #ff0b57d0 + #ff7cacf8 + #ffa8c7fa + #ffd3e3fd + #ff001d35 + #ffffffff + #ff003355 + #ff004a77 + #ff00639b + #ff5ab3f0 + #ff7fcfff + #ffc2e7ff + #ff072711 + #ffffffff + #ff0a3818 + #ff0f5223 + #ff146c2e + #ff6dd58c + #ffc4eed0 + #ffffffff diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index 24455235f..9072ad990 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -167,7 +167,7 @@ android:label="@string/gms_app_name" android:multiArch="true" android:networkSecurityConfig="@xml/network_security_config" - android:theme="@style/Theme.App"> + android:theme="@style/AppTheme"> @@ -185,7 +185,7 @@ android:exported="true" android:label="@string/pick_place_title" android:process=":ui" - android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"> + android:theme="@style/AppTheme"> @@ -411,8 +411,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"> @@ -571,6 +570,7 @@ - - - - - - - - - - () @@ -99,6 +103,12 @@ class SettingsFragment : ResourceSettingsFragment() { return this } + private fun openBrowserAt(url: String) { + val intent = Intent(Intent.ACTION_VIEW) + intent.data = Uri.parse(url) + startActivity(intent) + } + override fun onResume() { super.onResume() val context = requireContext() diff --git a/play-services-core/src/main/res/drawable/ic_add_account.xml b/play-services-core/src/main/res/drawable/ic_add_account.xml index 0056e68bb..456ca6551 100644 --- a/play-services-core/src/main/res/drawable/ic_add_account.xml +++ b/play-services-core/src/main/res/drawable/ic_add_account.xml @@ -7,7 +7,7 @@ diff --git a/play-services-core/src/main/res/drawable/ic_arrow_back.xml b/play-services-core/src/main/res/drawable/ic_arrow_back.xml new file mode 100644 index 000000000..1af4469d9 --- /dev/null +++ b/play-services-core/src/main/res/drawable/ic_arrow_back.xml @@ -0,0 +1,17 @@ + + + + + + diff --git a/play-services-core/src/main/res/drawable/ic_certificate.xml b/play-services-core/src/main/res/drawable/ic_certificate.xml index 6b17fdd57..a6d3c87eb 100644 --- a/play-services-core/src/main/res/drawable/ic_certificate.xml +++ b/play-services-core/src/main/res/drawable/ic_certificate.xml @@ -7,7 +7,7 @@ diff --git a/play-services-core/src/main/res/drawable/ic_cloud_bell.xml b/play-services-core/src/main/res/drawable/ic_cloud_bell.xml index f44782597..69be4d166 100644 --- a/play-services-core/src/main/res/drawable/ic_cloud_bell.xml +++ b/play-services-core/src/main/res/drawable/ic_cloud_bell.xml @@ -7,7 +7,7 @@ diff --git a/play-services-core/src/main/res/drawable/ic_device_login.xml b/play-services-core/src/main/res/drawable/ic_device_login.xml index f6eef5083..67796d953 100644 --- a/play-services-core/src/main/res/drawable/ic_device_login.xml +++ b/play-services-core/src/main/res/drawable/ic_device_login.xml @@ -7,7 +7,7 @@ diff --git a/play-services-core/src/main/res/drawable/ic_manage_accounts.xml b/play-services-core/src/main/res/drawable/ic_manage_accounts.xml index 249a49ca9..6cf2c4e5f 100644 --- a/play-services-core/src/main/res/drawable/ic_manage_accounts.xml +++ b/play-services-core/src/main/res/drawable/ic_manage_accounts.xml @@ -5,7 +5,7 @@ --> + android:tint="@color/e_icon_color"> diff --git a/play-services-core/src/main/res/layout/ask_gcm.xml b/play-services-core/src/main/res/layout/ask_gcm.xml index 975afa7b9..8359a4635 100644 --- a/play-services-core/src/main/res/layout/ask_gcm.xml +++ b/play-services-core/src/main/res/layout/ask_gcm.xml @@ -24,7 +24,7 @@ android:id="@+id/dialog_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/colorBackground" + android:background="@color/background_color" android:divider="?attr/dividerHorizontal" android:orientation="vertical" android:showDividers="middle"> @@ -74,6 +74,7 @@ android:background="?android:attr/selectableItemBackground" android:paddingLeft="8dp" android:paddingRight="8dp" + android:textColor="@color/settings_theme_accent" android:text="@string/allow"> @@ -84,6 +85,7 @@ android:background="?android:attr/selectableItemBackground" android:paddingLeft="8dp" android:paddingRight="8dp" + android:textColor="@color/settings_theme_accent" android:text="@string/deny"> diff --git a/play-services-core/src/main/res/layout/ask_permission.xml b/play-services-core/src/main/res/layout/ask_permission.xml index 7795e13fc..a30c74eeb 100644 --- a/play-services-core/src/main/res/layout/ask_permission.xml +++ b/play-services-core/src/main/res/layout/ask_permission.xml @@ -24,7 +24,7 @@ android:gravity="center_horizontal" android:paddingTop="10dp" android:text="@string/account_manager_title" - android:textColor="?attr/colorPrimary" + android:textColor="@color/primary_text_color" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -62,6 +62,7 @@ @@ -102,7 +103,7 @@ @@ -128,6 +130,7 @@ android:id="@android:id/button1" style="?attr/buttonBarButtonStyle" android:text="@string/allow" + android:textColor="@color/settings_theme_accent" android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/play-services-core/src/main/res/layout/ask_permission_list_entry.xml b/play-services-core/src/main/res/layout/ask_permission_list_entry.xml index dbc58106a..e687698dc 100644 --- a/play-services-core/src/main/res/layout/ask_permission_list_entry.xml +++ b/play-services-core/src/main/res/layout/ask_permission_list_entry.xml @@ -15,6 +15,7 @@ --> @@ -35,6 +37,7 @@ @@ -42,6 +45,7 @@ android:textSize="12sp" android:visibility="gone" android:id="@android:id/text2" + android:textColor="@color/secondary_text_color" android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/play-services-core/src/main/res/layout/games_info.xml b/play-services-core/src/main/res/layout/games_info.xml index 29b5e794a..65978db8c 100644 --- a/play-services-core/src/main/res/layout/games_info.xml +++ b/play-services-core/src/main/res/layout/games_info.xml @@ -27,7 +27,7 @@ android:gravity="center_horizontal" android:paddingTop="10dp" android:text="@string/games_title" - android:textColor="?attr/colorPrimary"/> + android:textColor="@color/primary_text_color"/> \ No newline at end of file diff --git a/play-services-core/src/main/res/layout/login_assistant.xml b/play-services-core/src/main/res/layout/login_assistant.xml index d59a1b1a5..de69686be 100644 --- a/play-services-core/src/main/res/layout/login_assistant.xml +++ b/play-services-core/src/main/res/layout/login_assistant.xml @@ -29,7 +29,7 @@ android:id="@+id/title_container" android:layout_width="match_parent" android:layout_height="64dp" - android:background="?attr/colorPrimary"> + android:background="?attr/colorPrimaryDark"> + android:textSize="24sp"/> + android:background="@color/settings_theme_primary_dark">