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

Commit 3bef4d81 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove explicit reference to Google in weathereffects" into main

parents e0b39197 27ba8aaf

weathereffects/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
     limitations under the License.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.google.android.wallpaper.weathereffects">

    package="com.android.wallpaper.weathereffects">

</manifest>

weathereffects/debug/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
     limitations under the License.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.google.android.wallpaper.weathereffects">

    package="com.android.wallpaper.weathereffects">

    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />



    <uses-feature
@@ -32,10 +32,10 @@ 
        android:name=".WallpaperEffectsDebugApplication"

        android:icon="@mipmap/ic_launcher">

        <provider

            android:name="com.google.android.wallpaper.weathereffects.provider.WeatherEffectsContentProvider"

            android:name="com.android.wallpaper.weathereffects.provider.WeatherEffectsContentProvider"

            android:authorities="${applicationId}.effectprovider"

            android:exported="true" />

        <service android:name="com.google.android.wallpaper.weathereffects.WeatherWallpaperService"

        <service android:name="com.android.wallpaper.weathereffects.WeatherWallpaperService"

            android:directBootAware="true"

            android:exported="true"

            android:label="@string/app_name"

weathereffects/debug/src/com/google/android/wallpaper/weathereffects/WallpaperEffectsDebugActivity.kt→weathereffects/debug/src/com/android/wallpaper/weathereffects/WallpaperEffectsDebugActivity.kt

+7 −7
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.google.android.wallpaper.weathereffects

package com.android.wallpaper.weathereffects



import android.animation.Animator

import android.animation.AnimatorListenerAdapter
@@ -32,15 +32,15 @@ import android.widget.FrameLayout 
import android.widget.SeekBar

import android.widget.TextView

import androidx.constraintlayout.widget.ConstraintLayout

import com.android.wallpaper.weathereffects.dagger.BackgroundScope

import com.android.wallpaper.weathereffects.dagger.MainScope

import com.android.wallpaper.weathereffects.data.repository.WallpaperFileUtils

import com.android.wallpaper.weathereffects.domain.WeatherEffectsInteractor

import com.android.wallpaper.weathereffects.provider.WallpaperInfoContract

import com.android.wallpaper.weathereffects.shared.model.WallpaperFileModel

import com.google.android.torus.core.activity.TorusViewerActivity

import com.google.android.torus.core.engine.TorusEngine

import com.google.android.torus.utils.extensions.setImmersiveFullScreen

import com.google.android.wallpaper.weathereffects.dagger.BackgroundScope

import com.google.android.wallpaper.weathereffects.dagger.MainScope

import com.google.android.wallpaper.weathereffects.data.repository.WallpaperFileUtils

import com.google.android.wallpaper.weathereffects.domain.WeatherEffectsInteractor

import com.google.android.wallpaper.weathereffects.provider.WallpaperInfoContract

import com.google.android.wallpaper.weathereffects.shared.model.WallpaperFileModel

import java.io.File

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

weathereffects/debug/src/com/google/android/wallpaper/weathereffects/WallpaperEffectsDebugApplication.kt→weathereffects/debug/src/com/android/wallpaper/weathereffects/WallpaperEffectsDebugApplication.kt

+10 −9
Original line number Diff line number Diff line
@@ -14,19 +14,20 @@ 
 * limitations under the License.

 */



package com.google.android.wallpaper.weathereffects

package com.android.wallpaper.weathereffects



import android.app.Application

import android.content.Context

import com.google.android.wallpaper.weathereffects.dagger.DaggerDebugApplicationComponent

import com.google.android.wallpaper.weathereffects.dagger.DebugApplicationComponent

import com.google.android.wallpaper.weathereffects.dagger.DependencyProvider

import com.android.wallpaper.weathereffects.dagger.DaggerDebugApplicationComponent

import com.android.wallpaper.weathereffects.dagger.DebugApplicationComponent

import com.android.wallpaper.weathereffects.dagger.DependencyProvider



class WallpaperEffectsDebugApplication : Application() {



    override fun attachBaseContext(base: Context?) {

        super.attachBaseContext(base)

        graph = DaggerDebugApplicationComponent.builder()

        graph =

            DaggerDebugApplicationComponent.builder()

                .dependencyProvider(DependencyProvider(this))

                .build()

    }

weathereffects/debug/src/com/google/android/wallpaper/weathereffects/dagger/DebugApplicationComponent.kt→weathereffects/debug/src/com/android/wallpaper/weathereffects/dagger/DebugApplicationComponent.kt

+5 −5
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
 * limitations under the License.

 */



package com.google.android.wallpaper.weathereffects.dagger

package com.android.wallpaper.weathereffects.dagger



import com.google.android.wallpaper.weathereffects.WallpaperEffectsDebugActivity

import com.google.android.wallpaper.weathereffects.WeatherWallpaperService

import com.google.android.wallpaper.weathereffects.provider.WeatherEffectsContentProvider

import com.android.wallpaper.weathereffects.WallpaperEffectsDebugActivity

import com.android.wallpaper.weathereffects.WeatherWallpaperService

import com.android.wallpaper.weathereffects.provider.WeatherEffectsContentProvider

import dagger.Component

import javax.inject.Singleton