diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml index f44336ab5a52..da4ad1b5a1d3 100644 --- a/.github/workflows/screenShotTest.yml +++ b/.github/workflows/screenShotTest.yml @@ -23,7 +23,7 @@ jobs: matrix: scheme: [ Light ] color: [ blue ] - api-level: [ 27 ] + api-level: [ 28 ] steps: - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1d38331a1588..470eede4ce09 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -94,7 +94,7 @@ android { defaultConfig { applicationId = "com.nextcloud.client" - minSdk = 27 + minSdk = 28 targetSdk = 36 compileSdk = 36 diff --git a/app/src/androidTest/assets/java.md b/app/src/androidTest/assets/java.md index 817cad1dca28..bb5b5059db36 100644 --- a/app/src/androidTest/assets/java.md +++ b/app/src/androidTest/assets/java.md @@ -2,22 +2,6 @@ Java: ```java private String getAppProcessName() { - String processName = ""; - if(Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { - ActivityManager manager = (ActivityManager) this.getSystemService(Context.ACTIVITY_SERVICE); - final int ownPid = android.os.Process.myPid(); - final List processes = manager.getRunningAppProcesses(); - if (processes != null) { - for (ActivityManager.RunningAppProcessInfo info : processes) { - if (info.pid == ownPid) { - processName = info.processName; - break; - } - } - } - } else { - processName = Application.getProcessName(); - } - return processName; - } + return Application.getProcessName(); +} ``` diff --git a/app/src/androidTest/java/com/nextcloud/client/TestRunner.kt b/app/src/androidTest/java/com/nextcloud/client/TestRunner.kt index d17ebcd46920..d5e0227cb6a2 100644 --- a/app/src/androidTest/java/com/nextcloud/client/TestRunner.kt +++ b/app/src/androidTest/java/com/nextcloud/client/TestRunner.kt @@ -1,6 +1,7 @@ /* * Nextcloud - Android Client * + * SPDX-FileCopyrightText: 2025 Alper Ozturk * SPDX-FileCopyrightText: 2023 Álvaro Brey * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH * SPDX-FileCopyrightText: 2019 Tobias Kaminsky @@ -9,23 +10,12 @@ package com.nextcloud.client import android.app.Application -import android.app.Instrumentation import android.content.Context -import android.os.Build import androidx.test.runner.AndroidJUnitRunner -import com.github.tmurakami.dexopener.DexOpener import com.nextcloud.test.TestMainApp class TestRunner : AndroidJUnitRunner() { @Throws(ClassNotFoundException::class, IllegalAccessException::class, InstantiationException::class) - override fun newApplication(cl: ClassLoader, className: String, context: Context): Application { - /* - * Initialize DexOpener only on API below 28 to enable mocking of Kotlin classes. - * On API 28+ the platform supports mocking natively. - */ - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { - DexOpener.install(this) - } - return Instrumentation.newApplication(TestMainApp::class.java, context) - } + override fun newApplication(cl: ClassLoader, className: String, context: Context): Application = + newApplication(TestMainApp::class.java, context) } diff --git a/app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperIT.kt b/app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperIT.kt index 1a5624f0b310..0c86e7a7ecd0 100644 --- a/app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperIT.kt @@ -9,9 +9,7 @@ package com.owncloud.android.datamodel import android.content.ContentResolver import android.net.Uri -import android.os.Build import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.filters.SdkSuppress import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -60,20 +58,4 @@ class ContentResolverHelperIT { null ) } - - @Test - @SdkSuppress(maxSdkVersion = Build.VERSION_CODES.N_MR1) - fun contentResolver_onAndroidBelow26_usesOldAPI() { - ContentResolverHelper - .queryResolver(resolver, URI, PROJECTION, SELECTION, null, SORT_COLUMN, SORT_DIRECTION, LIMIT) - - verify(resolver).query( - eq(URI), - eq(PROJECTION), - eq(SELECTION), - eq(null), - eq("$SORT_COLUMN $SORT_DIRECTION LIMIT $LIMIT"), - eq(null) - ) - } } diff --git a/app/src/main/java/com/nextcloud/client/jobs/clipboard/ClipboardClearWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/clipboard/ClipboardClearWorker.kt index 5adc17d530a0..a32ee3c3a035 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/clipboard/ClipboardClearWorker.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/clipboard/ClipboardClearWorker.kt @@ -33,12 +33,7 @@ class ClipboardClearWorker(private val context: Context, params: WorkerParameter return Result.success() } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - clipboardManager.clearPrimaryClip() - } else { - val newEmptyClip = ClipData.newPlainText("EmptyClipContent", "") - clipboardManager.setPrimaryClip(newEmptyClip) - } + clipboardManager.clearPrimaryClip() return Result.success() } catch (e: Exception) { diff --git a/app/src/main/java/com/owncloud/android/MainApp.java b/app/src/main/java/com/owncloud/android/MainApp.java index 02ea98ece021..e1b946e2781e 100644 --- a/app/src/main/java/com/owncloud/android/MainApp.java +++ b/app/src/main/java/com/owncloud/android/MainApp.java @@ -129,7 +129,7 @@ * Contains methods to build the "static" strings. These strings were before constants in different classes. */ public class MainApp extends Application implements HasAndroidInjector, NetworkChangeListener { - public static final OwnCloudVersion OUTDATED_SERVER_VERSION = NextcloudVersion.nextcloud_29; + public static final OwnCloudVersion OUTDATED_SERVER_VERSION = NextcloudVersion.nextcloud_30; public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_20; private static final String TAG = MainApp.class.getSimpleName(); @@ -233,23 +233,7 @@ private void registerNetworkChangeReceiver() { } private String getAppProcessName() { - String processName = ""; - if(Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { - ActivityManager manager = (ActivityManager) this.getSystemService(Context.ACTIVITY_SERVICE); - final int ownPid = android.os.Process.myPid(); - final List processes = manager.getRunningAppProcesses(); - if (processes != null) { - for (ActivityManager.RunningAppProcessInfo info : processes) { - if (info.pid == ownPid) { - processName = info.processName; - break; - } - } - } - } else { - processName = Application.getProcessName(); - } - return processName; + return Application.getProcessName(); } @Override diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt index f189c69a94ad..2e06e910a95f 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt @@ -10,7 +10,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.content.IntentFilter -import android.os.Build import android.os.Bundle import android.view.MenuItem import android.view.View @@ -129,10 +128,6 @@ class PreviewImageActivity : } private fun applyDisplayCutOutTopPadding() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { - return - } - window.decorView.setOnApplyWindowInsetsListener { view, insets -> val displayCutout = insets.displayCutout if (displayCutout != null) { diff --git a/app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt b/app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt index 06dcaf6be5d5..366f3fcef218 100644 --- a/app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt +++ b/app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt @@ -111,11 +111,10 @@ class TestPowerManagementService { } @Test - fun `battery charging status on API 17+`() { + fun `battery charging status`() { // GIVEN - // device has API level 17+ // battery status sticky intent is available - whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.JELLY_BEAN_MR1) + whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.P) val powerSources = setOf( BatteryManager.BATTERY_PLUGGED_AC, BatteryManager.BATTERY_PLUGGED_USB, @@ -134,29 +133,6 @@ class TestPowerManagementService { } } - @Test - fun `battery charging status on API 16`() { - // GIVEN - // device has API level 16 - // battery status sticky intent is available - whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.JELLY_BEAN) - val powerSources = setOf( - BatteryManager.BATTERY_PLUGGED_AC, - BatteryManager.BATTERY_PLUGGED_USB - ) - - for (row in powerSources) { - // WHEN - // device is charging using AC or USB - whenever(intent.getIntExtra(eq(BatteryManager.EXTRA_PLUGGED), any())) - .thenReturn(row) - - // THEN - // charging flag is true - assertTrue(powerManagementService.battery.isCharging) - } - } - @Test fun `battery status sticky intent is not available`() { // GIVEN diff --git a/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt b/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt index 93d4e35de7bc..2af10230e3bc 100644 --- a/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt +++ b/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt @@ -144,11 +144,10 @@ class BackgroundJobFactoryTest { } @Test - fun content_observer_worker_is_created_on_api_level_24() { + fun content_observer_worker_is_created() { // GIVEN - // api level is > 24 // content URI trigger is supported - whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.N) + whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.P) // WHEN // factory is called to create content observer worker diff --git a/appscan/build.gradle.kts b/appscan/build.gradle.kts index 5311613b85c7..f16887151766 100644 --- a/appscan/build.gradle.kts +++ b/appscan/build.gradle.kts @@ -15,7 +15,7 @@ android { namespace = "com.nextcloud.appscan" defaultConfig { - minSdk = 27 + minSdk = 28 compileSdk = 36 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e75c61d5ec48..a24bcb59ab0d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ androidCommonLibraryVersion = "0.30.0" androidGifDrawableVersion = "1.2.29" androidImageCropperVersion = "4.7.0" -androidLibraryVersion = "b8f77935157e44c1d7a71f81271b412b0dbe8c76" +androidLibraryVersion = "827db94ca661d39ca7fae5c608eab1282b629b84" androidPluginVersion = '8.13.1' androidsvgVersion = "1.4" androidxMediaVersion = "1.5.1" diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 56a931fe87be..850eee592e85 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -1547,6 +1547,47 @@ yzETgE8zz59/t9SaMpJ0Wtw2iS688bZba+b0OT6AsrI= =XaPu -----END PGP PUBLIC KEY BLOCK----- +pub AE094C852B4EE5DC +sub 2728E6DC4904AE9D +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=UQCs +-----END PGP PUBLIC KEY BLOCK----- + pub AE5A7FB608A0221C uid Robert Scholte @@ -6139,6 +6180,21 @@ ZgMBzI+v/ingWOyKpKqhpZR/50PHA0o23zw8P1BGeQOlr4kFNA== =jR+6 -----END PGP PUBLIC KEY BLOCK----- +pub 340B090F727518D8 +uid Thomas Ball + +sub 6EAC8515E0EBB87E +-----BEGIN PGP PUBLIC KEY BLOCK----- + +xjMEaJzwtxYJKwYBBAHaRw8BAQdAmw8gRfE8mqvum1kG2Zlm6t46bkXFvJIHRVBZ +OctVLVe0HlRob21hcyBCYWxsIDx0YmFsbEBnb29nbGUuY29tPs44BGic8LcSCisG +AQQBl1UBBQEBB0A+DJUNDeULyBrFpk3P07SXnEAch7KoDYah6j0PxgnNQgMBCAfC +fgQYFgoAJhYhBMMlnSDa7ErObVfMgzQLCQ9ydRjYBQJonPC3AhsMBQkFo5qAAAoJ +EDQLCQ9ydRjY3/MA/38kMom8Qy8gO3AH31GqVqguYruG848SaIJugavlTT4sAP9D +EfbsFU4kymcgABRT9CyDsNAmI/lxRNEB+pxiNp1/DA== +=FAP2 +-----END PGP PUBLIC KEY BLOCK----- + pub 347CD0EAED975C5F uid Eric Vergnaud diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 659f2c1dc19c..cf77507ec229 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -17,11 +17,8 @@ - - - - + @@ -613,6 +610,9 @@ + + + @@ -651,6 +651,14 @@ + + + + + + + + @@ -722,6 +730,14 @@ + + + + + + + + @@ -1418,6 +1434,14 @@ + + + + + + + + @@ -1490,6 +1514,19 @@ + + + + + + + + + + + + + @@ -1562,6 +1599,14 @@ + + + + + + + + @@ -1570,6 +1615,14 @@ + + + + + + + + @@ -1642,6 +1695,19 @@ + + + + + + + + + + + + + @@ -1714,6 +1780,22 @@ + + + + + + + + + + + + + + + + @@ -1786,6 +1868,19 @@ + + + + + + + + + + + + + @@ -1858,6 +1953,22 @@ + + + + + + + + + + + + + + + + @@ -1930,6 +2041,19 @@ + + + + + + + + + + + + + @@ -2002,6 +2126,19 @@ + + + + + + + + + + + + + @@ -2047,6 +2184,14 @@ + + + + + + + + @@ -2167,6 +2312,14 @@ + + + + + + + + @@ -2239,6 +2392,19 @@ + + + + + + + + + + + + + @@ -2311,6 +2477,14 @@ + + + + + + + + @@ -2372,6 +2546,14 @@ + + + + + + + + @@ -2457,6 +2639,19 @@ + + + + + + + + + + + + + @@ -2529,6 +2724,22 @@ + + + + + + + + + + + + + + + + @@ -2561,6 +2772,19 @@ + + + + + + + + + + + + + @@ -2593,6 +2817,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -2601,6 +2849,14 @@ + + + + + + + + @@ -2686,6 +2942,19 @@ + + + + + + + + + + + + + @@ -2758,6 +3027,14 @@ + + + + + + + + @@ -2766,6 +3043,14 @@ + + + + + + + + @@ -2846,6 +3131,19 @@ + + + + + + + + + + + + + @@ -2918,6 +3216,14 @@ + + + + + + + + @@ -2926,6 +3232,14 @@ + + + + + + + + @@ -3006,6 +3320,19 @@ + + + + + + + + + + + + + @@ -3078,6 +3405,14 @@ + + + + + + + + @@ -3086,6 +3421,14 @@ + + + + + + + + @@ -3166,6 +3509,19 @@ + + + + + + + + + + + + + @@ -3238,6 +3594,14 @@ + + + + + + + + @@ -3278,6 +3642,14 @@ + + + + + + + + @@ -3358,6 +3730,19 @@ + + + + + + + + + + + + + @@ -3430,6 +3815,19 @@ + + + + + + + + + + + + + @@ -3475,6 +3873,14 @@ + + + + + + + + @@ -3547,6 +3953,11 @@ + + + + + @@ -3592,6 +4003,14 @@ + + + + + + + + @@ -3664,6 +4083,14 @@ + + + + + + + + @@ -3736,6 +4163,14 @@ + + + + + + + + @@ -3816,6 +4251,14 @@ + + + + + + + + @@ -3896,6 +4339,19 @@ + + + + + + + + + + + + + @@ -3968,6 +4424,14 @@ + + + + + + + + @@ -3976,6 +4440,14 @@ + + + + + + + + @@ -4056,6 +4528,19 @@ + + + + + + + + + + + + + @@ -4128,6 +4613,14 @@ + + + + + + + + @@ -4470,6 +4963,14 @@ + + + + + + + + @@ -4542,6 +5043,14 @@ + + + + + + + + @@ -4662,6 +5171,14 @@ + + + + + + + + @@ -4782,6 +5299,14 @@ + + + + + + + + @@ -4902,6 +5427,14 @@ + + + + + + + + @@ -5022,6 +5555,14 @@ + + + + + + + + @@ -5142,6 +5683,14 @@ + + + + + + + + @@ -5262,6 +5811,14 @@ + + + + + + + + @@ -5648,6 +6205,14 @@ + + + + + + + + @@ -5968,6 +6533,14 @@ + + + + + + + + @@ -6060,6 +6633,14 @@ + + + + + + + + @@ -6129,6 +6710,14 @@ + + + + + + + + @@ -6205,6 +6794,9 @@ + + + @@ -6311,6 +6903,14 @@ + + + + + + + + @@ -6404,6 +7004,14 @@ + + + + + + + + @@ -6481,6 +7089,14 @@ + + + + + + + + @@ -6574,6 +7190,14 @@ + + + + + + + + @@ -6666,6 +7290,14 @@ + + + + + + + + @@ -6722,6 +7354,14 @@ + + + + + + + + @@ -6769,6 +7409,14 @@ + + + + + + + + @@ -6825,6 +7473,14 @@ + + + + + + + + @@ -6896,6 +7552,14 @@ + + + + + + + + @@ -6952,6 +7616,14 @@ + + + + + + + + @@ -7013,6 +7685,17 @@ + + + + + + + + + + + @@ -7126,6 +7809,14 @@ + + + + + + + + @@ -7182,6 +7873,14 @@ + + + + + + + + @@ -7259,6 +7958,17 @@ + + + + + + + + + + + @@ -7361,6 +8071,14 @@ + + + + + + + + @@ -8294,6 +9012,14 @@ + + + + + + + + @@ -8326,6 +9052,14 @@ + + + + + + + + @@ -8374,6 +9108,14 @@ + + + + + + + + @@ -8422,6 +9164,14 @@ + + + + + + + + @@ -8454,6 +9204,14 @@ + + + + + + + + @@ -8547,6 +9305,14 @@ + + + + + + + + @@ -8579,6 +9345,14 @@ + + + + + + + + @@ -8627,6 +9401,14 @@ + + + + + + + + @@ -8659,6 +9441,14 @@ + + + + + + + + @@ -8707,6 +9497,14 @@ + + + + + + + + @@ -8739,6 +9537,14 @@ + + + + + + + + @@ -8795,6 +9601,14 @@ + + + + + + + + @@ -8819,6 +9633,14 @@ + + + + + + + + @@ -8832,6 +9654,11 @@ + + + + + @@ -8840,6 +9667,14 @@ + + + + + + + + @@ -8864,6 +9699,14 @@ + + + + + + + + @@ -8904,6 +9747,14 @@ + + + + + + + + @@ -8968,6 +9819,14 @@ + + + + + + + + @@ -9000,6 +9859,14 @@ + + + + + + + + @@ -9053,6 +9920,14 @@ + + + + + + + + @@ -9085,6 +9960,14 @@ + + + + + + + + @@ -9678,6 +10561,14 @@ + + + + + + + + @@ -9782,6 +10673,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -9822,6 +10734,14 @@ + + + + + + + + @@ -9878,6 +10798,14 @@ + + + + + + + + @@ -9992,6 +10920,14 @@ + + + + + + + + @@ -10112,6 +11048,14 @@ + + + + + + + + @@ -10205,6 +11149,11 @@ + + + + + @@ -10242,6 +11191,14 @@ + + + + + + + + @@ -10335,6 +11292,11 @@ + + + + + @@ -10372,6 +11334,14 @@ + + + + + + + + @@ -10492,6 +11462,14 @@ + + + + + + + + @@ -10612,6 +11590,14 @@ + + + + + + + + @@ -10788,6 +11774,14 @@ + + + + + + + + @@ -10908,6 +11902,14 @@ + + + + + + + + @@ -11028,6 +12030,14 @@ + + + + + + + + @@ -11148,6 +12158,14 @@ + + + + + + + + @@ -11268,6 +12286,14 @@ + + + + + + + + @@ -11388,6 +12414,14 @@ + + + + + + + + @@ -11508,6 +12542,14 @@ + + + + + + + + @@ -11631,6 +12673,14 @@ + + + + + + + + @@ -11719,6 +12769,14 @@ + + + + + + + + @@ -11839,6 +12897,14 @@ + + + + + + + + @@ -11959,6 +13025,14 @@ + + + + + + + + @@ -12079,6 +13153,14 @@ + + + + + + + + @@ -12199,6 +13281,14 @@ + + + + + + + + @@ -12319,6 +13409,14 @@ + + + + + + + + @@ -12439,6 +13537,14 @@ + + + + + + + + @@ -12607,6 +13713,14 @@ + + + + + + + + @@ -12727,6 +13841,14 @@ + + + + + + + + @@ -12823,6 +13945,14 @@ + + + + + + + + @@ -12855,6 +13985,14 @@ + + + + + + + + @@ -12975,6 +14113,14 @@ + + + + + + + + @@ -13123,6 +14269,14 @@ + + + + + + + + @@ -13243,6 +14397,14 @@ + + + + + + + + @@ -13531,6 +14693,14 @@ + + + + + + + + @@ -13875,6 +15045,14 @@ + + + + + + + + @@ -13995,6 +15173,14 @@ + + + + + + + + @@ -14115,6 +15301,14 @@ + + + + + + + + @@ -14235,6 +15429,14 @@ + + + + + + + + @@ -14579,6 +15781,14 @@ + + + + + + + + @@ -14659,6 +15869,14 @@ + + + + + + + + @@ -14739,6 +15957,14 @@ + + + + + + + + @@ -14859,6 +16085,14 @@ + + + + + + + + @@ -14979,6 +16213,14 @@ + + + + + + + + @@ -15099,6 +16341,14 @@ + + + + + + + + @@ -15219,6 +16469,14 @@ + + + + + + + + @@ -15339,6 +16597,14 @@ + + + + + + + + @@ -15459,6 +16725,14 @@ + + + + + + + + @@ -15579,6 +16853,14 @@ + + + + + + + + @@ -15699,6 +16981,14 @@ + + + + + + + + @@ -15819,6 +17109,14 @@ + + + + + + + + @@ -15939,6 +17237,14 @@ + + + + + + + + @@ -16059,6 +17365,14 @@ + + + + + + + + @@ -16355,6 +17669,14 @@ + + + + + + + + @@ -16475,6 +17797,14 @@ + + + + + + + + @@ -16595,6 +17925,14 @@ + + + + + + + + @@ -16856,6 +18194,14 @@ + + + + + + + + @@ -16896,6 +18242,14 @@ + + + + + + + + @@ -16936,6 +18290,14 @@ + + + + + + + + @@ -17614,6 +18976,14 @@ + + + + + + + + @@ -17966,6 +19336,14 @@ + + + + + + + + @@ -19232,6 +20610,14 @@ + + + + + + + + @@ -20548,6 +21934,11 @@ + + + + + @@ -20654,6 +22045,11 @@ + + + + + @@ -20702,6 +22098,14 @@ + + + + + + + + @@ -20875,6 +22279,14 @@ + + + + + + + + @@ -21075,6 +22487,14 @@ + + + + + + + + @@ -21187,6 +22607,14 @@ + + + + + + + + @@ -21324,6 +22752,14 @@ + + + + + + + + @@ -21440,6 +22876,11 @@ + + + + + @@ -21925,6 +23366,9 @@ + + + @@ -23010,6 +24454,14 @@ + + + + + + + + @@ -23018,6 +24470,14 @@ + + + + + + + + @@ -23039,6 +24499,14 @@ + + + + + + + + @@ -23089,6 +24557,14 @@ + + + + + + + + @@ -23333,6 +24809,14 @@ + + + + + + + + @@ -23349,6 +24833,14 @@ + + + + + + + + @@ -23365,6 +24857,14 @@ + + + + + + + + @@ -23381,6 +24881,14 @@ + + + + + + + + @@ -23397,6 +24905,14 @@ + + + + + + + + @@ -23489,6 +25005,14 @@ + + + + + + + + @@ -23567,6 +25091,14 @@ + + + + + + + + @@ -26638,6 +28170,11 @@ + + + + + @@ -27154,6 +28691,14 @@ + + + + + + + + @@ -27210,6 +28755,14 @@ + + + + + + + + @@ -27258,6 +28811,14 @@ + + + + + + + + @@ -27566,6 +29127,14 @@ + + + + + + + + @@ -27581,6 +29150,11 @@ + + + + + @@ -27605,6 +29179,14 @@ + + + + + + + + @@ -31192,6 +32774,14 @@ + + + + + + + + @@ -31357,6 +32947,14 @@ + + + + + + + + diff --git a/scripts/updateScreenshots.sh b/scripts/updateScreenshots.sh index 07ec525ef672..d64ad43aa513 100755 --- a/scripts/updateScreenshots.sh +++ b/scripts/updateScreenshots.sh @@ -12,7 +12,7 @@ fi ## emulator if [[ ! $(emulator -list-avds | grep uiComparison -c) -eq 0 ]]; then avdmanager delete avd -n uiComparison - (sleep 5; echo "no") | avdmanager create avd -n uiComparison -c 100M -k "system-images;android-27;google_apis;x86" --abi "google_apis/x86" + (sleep 5; echo "no") | avdmanager create avd -n uiComparison -c 100M -k "system-images;android-28;google_apis;x86" --abi "google_apis/x86" fi if [ "$1" == "debug" ]; then