etc
/
VancedMicroG
mirror of https://github.com/YTVanced/VancedMicroG
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge

This commit is contained in:
X1nto 2020-07-27 17:09:04 +04:00
parent 4561007137 54280d7412
commit 1062253727
4 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
play-services-cast-api/build.gradle
View File

@ -37,6 +37,5 @@ android {
dependencies {
api project(':play-services-basement')
api project(':play-services-base-api')
}

8
play-services-cast/build.gradle
View File

@ -26,13 +26,13 @@ String getMyVersionName() {
}
android {
compileSdkVersion androidCompileSdk()
compileSdkVersion androidCompileSdk
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName getMyVersionName()
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
}
compileOptions {

2
play-services-core/build.gradle
View File

@ -40,7 +40,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:$appcompatVersion"
implementation "androidx.mediarouter:mediarouter:$mediarouterVersion"
implementation "androidx.preference:preference:$preferenceVersion"
implementation "androidx.navigation:navigation:$navigationVersion"
implementation "androidx.navigation:navigation-fragment:$navigationVersion"
implementation "androidx.navigation:navigation-ui:$navigationVersion"
}

96
play-services-core/src/main/res/navigation/nav_settings.xml
View File

@ -14,52 +14,52 @@
<action
android:id="@+id/openUnifiedNlpSettings"
app:destination="@id/nav_unlp"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
<action
android:id="@+id/openSelfcheck"
app:destination="@id/selfcheckFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
<action
android:id="@+id/openCheckinSettings"
app:destination="@id/checkinFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
<action
android:id="@+id/openGcmSettings"
app:destination="@id/gcmFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
<action
android:id="@+id/openSafetyNetSettings"
app:destination="@id/safetyNetFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
<action
android:id="@+id/openMoreGoogleSettings"
app:destination="@id/googleMoreFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
<action
android:id="@+id/openAbout"
app:destination="@id/aboutFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
</fragment>
<fragment
@ -79,24 +79,24 @@
<action
android:id="@+id/openGcmAppDetails"
app:destination="@id/gcmAppFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
<action
android:id="@+id/openAllGcmApps"
app:destination="@id/gcmAllAppsFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
<action
android:id="@+id/openGcmAdvancedSettings"
app:destination="@id/gcmAdvancedFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
</fragment>
<fragment
android:id="@+id/gcmAllAppsFragment"
@ -105,10 +105,10 @@
<action
android:id="@+id/openGcmAppDetailsFromAll"
app:destination="@id/gcmAppFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
</fragment>
<fragment
android:id="@+id/gcmAppFragment"
@ -130,10 +130,10 @@
<action
android:id="@+id/openSafetyNetAdvancedSettings"
app:destination="@id/safetyNetAdvancedFragment"
app:enterAnim="@android:anim/fragment_open_enter"
app:exitAnim="@android:anim/fragment_open_exit"
app:popEnterAnim="@android:anim/fragment_close_enter"
app:popExitAnim="@android:anim/fragment_close_exit" />
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
</fragment>
<fragment
android:id="@+id/safetyNetAdvancedFragment"