Merge "Fix grid selection be cleared if rotate screen at multi-pane device" into sc-v2-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ea2f7e..3eca599 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -42,10 +42,6 @@
the one bundled with selected Theme [CHAR LIMIT=35]-->
<string name="keep_my_wallpaper">Keep current wallpaper</string>
- <!-- Label for a button that allows the user to apply the currently selected customization option.
- [CHAR LIMIT=20] -->
- <string name="apply_btn">Apply</string>
-
<!-- Content description of theme preview card. [CHAR_LIMIT=30]-->
<string name="theme_preview_card_content_description">Style preview</string>
diff --git a/src/com/android/customization/module/DefaultCustomizationInjector.java b/src/com/android/customization/module/DefaultCustomizationInjector.java
index db899a3..c906281 100644
--- a/src/com/android/customization/module/DefaultCustomizationInjector.java
+++ b/src/com/android/customization/module/DefaultCustomizationInjector.java
@@ -95,8 +95,10 @@
WallpaperInfo wallpaperInfo,
int mode,
boolean viewAsHome,
+ boolean viewFullScreen,
boolean testingModeEnabled) {
- return PreviewFragment.newInstance(wallpaperInfo, mode, viewAsHome, testingModeEnabled);
+ return PreviewFragment.newInstance(wallpaperInfo, mode, viewAsHome, viewFullScreen,
+ testingModeEnabled);
}
@Override
diff --git a/src_override/com/android/wallpaper/module/WallpapersInjector.java b/src_override/com/android/wallpaper/module/WallpapersInjector.java
index f1748b4..f8a4182 100755
--- a/src_override/com/android/wallpaper/module/WallpapersInjector.java
+++ b/src_override/com/android/wallpaper/module/WallpapersInjector.java
@@ -72,8 +72,9 @@
WallpaperInfo wallpaperInfo,
int mode,
boolean viewAsHome,
+ boolean viewFullScreen,
boolean testingModeEnabled) {
- return ImagePreviewFragment.newInstance(wallpaperInfo, mode, viewAsHome,
+ return ImagePreviewFragment.newInstance(wallpaperInfo, mode, viewAsHome, viewFullScreen,
testingModeEnabled);
}