Defer content view resolve for KeyboardHeightProvider to allow for la…

…te setContentView (libgdx#7553)
TCreutzenberg · Dec 27, 2024 · 5ca5b71 · 5ca5b71
1 parent e67b29d
commit 5ca5b71
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -6,6 +6,7 @@
 - Added XmlReader.getChildren() and XmlReader.replaceChild()
 - LWJGL3: Fix pauseWhenLostFocus not working as expected
 - API Addition: Added FPSLogger#setBound
+- Android: Fix crash on startup if `setContentView` was manually called after `initializeForView`
 
 [1.13.0]
 - [BREAKING CHANGE] GWT: Updated to 2.11.0. `com.google.jsinterop:jsinterop-annotations:2.0.2:sources` must be added as a dependency to your html project dependencies.

diff --git a/.../src/com/badlogic/gdx/backends/android/keyboardheight/AndroidXKeyboardHeightProvider.java b/.../src/com/badlogic/gdx/backends/android/keyboardheight/AndroidXKeyboardHeightProvider.java
@@ -13,8 +13,8 @@
 
 public class AndroidXKeyboardHeightProvider implements KeyboardHeightProvider {
 
-	private final View view;
 	private final Activity activity;
+	private View view;
 	private KeyboardHeightObserver observer;
 
 	/** The cached landscape height of the keyboard */
@@ -24,12 +24,12 @@ public class AndroidXKeyboardHeightProvider implements KeyboardHeightProvider {
 	private static int keyboardPortraitHeight;
 
 	public AndroidXKeyboardHeightProvider (final Activity activity) {
-		this.view = activity.findViewById(android.R.id.content);
 		this.activity = activity;
 	}
 
 	@Override
 	public void start () {
+		this.view = activity.findViewById(android.R.id.content);
 		ViewCompat.setOnApplyWindowInsetsListener(view, new OnApplyWindowInsetsListener() {
 			@NotNull
 			@Override

diff --git a/.../src/com/badlogic/gdx/backends/android/keyboardheight/StandardKeyboardHeightProvider.java b/.../src/com/badlogic/gdx/backends/android/keyboardheight/StandardKeyboardHeightProvider.java
@@ -74,8 +74,6 @@ public StandardKeyboardHeightProvider (Activity activity) {
 		setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_RESIZE | LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
 		setInputMethodMode(PopupWindow.INPUT_METHOD_NEEDED);
 
-		parentView = activity.findViewById(android.R.id.content);
-
 		setWidth(0);
 		setHeight(android.view.ViewGroup.LayoutParams.MATCH_PARENT);
 
@@ -94,7 +92,7 @@ public void onGlobalLayout () {
 	 * be registered before the onResume has finished of the Activity. */
 	@Override
 	public void start () {
-
+		parentView = activity.findViewById(android.R.id.content);
 		if (!isShowing() && parentView.getWindowToken() != null) {
 			setBackgroundDrawable(new ColorDrawable(0));
 			showAtLocation(parentView, Gravity.NO_GRAVITY, 0, 0);