Merge branch 'master' into bugfix/after-selecting-file-from-search-it…

…-does-not-open-9652165

.devcontainer/devcontainer.json

@@ -1,4 +1,4 @@
 {
 	"name": "NextcloudAndroid",
-	"dockerFile": "Dockerfile",
+	"dockerFile": "Dockerfile"
 }

app/src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -415,10 +415,11 @@ protected void enableRTL() {
     }
 
     protected void resetLocale() {
+        Locale locale = new Locale("en");
         Resources resources = InstrumentationRegistry.getInstrumentation().getTargetContext().getResources();
-        Configuration defaultConfig = resources.getConfiguration();
-        defaultConfig.setLocale(Locale.getDefault());
-        resources.updateConfiguration(defaultConfig, null);
+        Configuration config = resources.getConfiguration();
+        config.setLocale(locale);
+        resources.updateConfiguration(config, null);
     }
 
     protected void screenshot(View view) {

app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java

@@ -108,10 +108,7 @@ private FileDisplayActivity getFileDisplayActivity() {
         Intent intent = new Intent(targetContext, FileDisplayActivity.class);
         return activityRule.launchActivity(intent);
     }
-
-    @Rule
-    public GrantPermissionRule permissionRule = GrantPermissionRule.grant(
-        android.Manifest.permission.POST_NOTIFICATIONS);
+
 
     @After
     public void quitLooperIfNeeded() {

app/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.kt

@@ -54,7 +54,7 @@ class LoadingDialog : DialogFragment(), Injectable {
             viewThemeUtils?.platform?.tintDrawable(requireContext(), loadingDrawable)
         }
 
-        viewThemeUtils?.platform?.colorViewBackground(binding.loadingLayout, ColorRole.SURFACE_VARIANT)
+        viewThemeUtils?.platform?.colorViewBackground(binding.loadingLayout, ColorRole.SURFACE)
 
         return binding.root
     }