From 118d903e2dd04f146261d2fe1d775b3a89bcd39d Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 5 Mar 2026 06:04:01 -0800 Subject: [PATCH] mici ui: slim review terms (#37573) * replace * fix --- selfdrive/ui/mici/layouts/onboarding.py | 9 ++++++--- selfdrive/ui/mici/layouts/settings/device.py | 8 ++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/selfdrive/ui/mici/layouts/onboarding.py b/selfdrive/ui/mici/layouts/onboarding.py index cf633192e..557a8de8b 100644 --- a/selfdrive/ui/mici/layouts/onboarding.py +++ b/selfdrive/ui/mici/layouts/onboarding.py @@ -337,13 +337,16 @@ class TermsPage(Scroller): self._decline_button = BigCircleButton("icons_mici/setup/cancel.png", red=True) self._decline_button.set_click_callback(show_decline_dialog) + self._terms_header = GreyBigButton("terms and\nconditions", "scroll to continue", + gui_app.texture("icons_mici/setup/green_info.png", 64, 64)) + self._must_accept_card = GreyBigButton("", "You must accept the Terms & Conditions to use openpilot.") + self._scroller.add_widgets([ - GreyBigButton("terms and\nconditions", "scroll to continue", - gui_app.texture("icons_mici/setup/green_info.png", 64, 64)), + self._terms_header, GreyBigButton("swipe for QR code", "or go to https://comma.ai/terms", gui_app.texture("icons_mici/setup/small_slider/slider_arrow.png", 64, 56, flip_x=True)), QRCodeWidget("https://comma.ai/terms"), - GreyBigButton("", "You must accept the Terms & Conditions to use openpilot."), + self._must_accept_card, self._accept_button, self._decline_button, ]) diff --git a/selfdrive/ui/mici/layouts/settings/device.py b/selfdrive/ui/mici/layouts/settings/device.py index ed29a6a84..78ec67ccb 100644 --- a/selfdrive/ui/mici/layouts/settings/device.py +++ b/selfdrive/ui/mici/layouts/settings/device.py @@ -13,7 +13,6 @@ from openpilot.selfdrive.ui.mici.widgets.dialog import BigDialog, BigConfirmatio from openpilot.selfdrive.ui.mici.widgets.pairing_dialog import PairingDialog from openpilot.selfdrive.ui.mici.onroad.driver_camera_dialog import DriverCameraDialog from openpilot.selfdrive.ui.mici.layouts.onboarding import TrainingGuide, TermsPage -from openpilot.system.ui.mici_setup import BigPillButton from openpilot.system.ui.lib.application import gui_app, FontWeight, MousePos from openpilot.system.ui.lib.multilang import tr from openpilot.system.ui.widgets import Widget @@ -27,13 +26,11 @@ class ReviewTermsPage(TermsPage, NavScroller): """TermsPage with NavWidget swipe-to-dismiss for reviewing in device settings.""" def __init__(self): super().__init__(on_accept=self.dismiss, on_decline=self.dismiss) + self._terms_header.set_visible(False) + self._must_accept_card.set_visible(False) self._accept_button.set_visible(False) self._decline_button.set_visible(False) - close_button = BigPillButton("close") - close_button.set_click_callback(self.dismiss) - self._scroller.add_widget(close_button) - class ReviewTrainingGuide(TrainingGuide): def show_event(self): @@ -340,7 +337,6 @@ class DeviceLayoutMici(NavScroller): terms_btn = BigButton("terms &\nconditions", "", "icons_mici/settings/device/info.png") terms_btn.set_click_callback(lambda: gui_app.push_widget(ReviewTermsPage())) - terms_btn.set_enabled(lambda: ui_state.is_offroad()) self._scroller.add_widgets([ DeviceInfoLayoutMici(),