Skip to content

Commit 29d3e8a

Browse files
Promote setting_activity from app to framework
1 parent c4283db commit 29d3e8a

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
from mpos.activity_navigator import ActivityNavigator
44

55
from mpos.ui.keyboard import MposKeyboard
6-
from mpos import PackageManager
6+
from mpos import PackageManager, SettingActivity
77
import mpos.config
88
import mpos.ui
99
import mpos.time
1010

11-
from setting_activity import SettingActivity
1211
from calibrate_imu import CalibrateIMUActivity
1312
from check_imu_calibration import CheckIMUCalibrationActivity
1413

internal_filesystem/lib/mpos/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
from .app.activities.view import ViewActivity
1414
from .app.activities.share import ShareActivity
1515

16+
from .ui.setting_activity import SettingActivity
17+
1618
__all__ = [
1719
"App", "Activity", "ConnectivityManager", "DownloadManager", "Intent",
1820
"ActivityNavigator", "PackageManager", "TaskManager",
19-
"ChooserActivity", "ViewActivity", "ShareActivity"
21+
"ChooserActivity", "ViewActivity", "ShareActivity",
22+
"SettingActivity"
2023
]

internal_filesystem/lib/mpos/ui/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
)
1515
from .event import get_event_name, print_event
1616
from .util import shutdown, set_foreground_app, get_foreground_app
17+
from .setting_activity import SettingActivity
1718

1819
__all__ = [
1920
"setContentView", "back_screen", "remove_and_stop_current_activity", "remove_and_stop_all_activities"
@@ -26,5 +27,6 @@
2627
"min_resolution", "max_resolution",
2728
"get_pointer_xy",
2829
"get_event_name", "print_event",
29-
"shutdown", "set_foreground_app", "get_foreground_app"
30+
"shutdown", "set_foreground_app", "get_foreground_app",
31+
"SettingActivity"
3032
]

internal_filesystem/builtin/apps/com.micropythonos.settings/assets/setting_activity.py renamed to internal_filesystem/lib/mpos/ui/setting_activity.py

File renamed without changes.

0 commit comments

Comments
 (0)