Merge remote-tracking branch 'origin/rustify' into worktree-agent-a754368325fa06839

iris/android-app/src/bench_client.rs

@@ -365,6 +365,18 @@ impl AndroidAppState for BenchClient {
             (self.top_bar)(rsc).set(controls);
         }
 
+        // The composer bar sits directly on whichever of the IME or the
+        // navigation bar is currently the bottom of usable space -- see
+        // `transcript_ui::composer::Composer::set_bottom_inset`'s doc.
+        // `ime_bottom` already exceeds the plain nav-bar inset whenever the
+        // keyboard covers it, so the larger of the two is always the right
+        // answer without needing to know which is currently showing.
+        if let Some(screen) = &self.screen {
+            screen
+                .composer
+                .set_bottom_inset(rsc, insets.bottom.max(insets.ime_bottom));
+        }
+
         let ime_visible = insets.ime_bottom > 0.0;
 
         let mut ime = self.ime_state.lock().unwrap();