Skip to content

Update A11yMethod wiring #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update A11yMethod wiring #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions android_world/env/android_world_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,12 @@ class AndroidWorldController(base_wrapper.BaseWrapper):
def __init__(
self,
env: env_interface.AndroidEnvInterface,
a11y_method: A11yMethod = A11yMethod.A11Y_FORWARDER_APP,
a11y_method: A11yMethod | None = None,
install_a11y_forwarding_app: bool = True,
):
self._original_env = env
if a11y_method is None:
a11y_method = A11yMethod.A11Y_FORWARDER_APP
if a11y_method == A11yMethod.A11Y_FORWARDER_APP:
self._env = apply_a11y_forwarder_app_wrapper(
env, install_a11y_forwarding_app
Expand Down Expand Up @@ -201,6 +203,7 @@ def refresh_env(self):
console_port=self.env._coordinator._simulator._config.emulator_launcher.emulator_console_port,
adb_path=self.env._coordinator._simulator._config.adb_controller.adb_path,
grpc_port=self.env._coordinator._simulator._config.emulator_launcher.grpc_port,
a11y_method=self._a11y_method,
).env
# pylint: enable=protected-access
# pytype: enable=attribute-error
Expand Down Expand Up @@ -308,6 +311,7 @@ def get_controller(
console_port: int = 5554,
adb_path: str = DEFAULT_ADB_PATH,
grpc_port: int = 8554,
a11y_method: A11yMethod | None = None,
) -> AndroidWorldController:
"""Creates a controller by connecting to an existing Android environment."""

Expand All @@ -326,4 +330,4 @@ def get_controller(
)
android_env_instance = loader.load(config)
logging.info('Setting up AndroidWorldController.')
return AndroidWorldController(android_env_instance)
return AndroidWorldController(android_env_instance, a11y_method=a11y_method)
2 changes: 1 addition & 1 deletion android_world/env/env_launcher_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def test_get_env(
),
)
)
mock_controller.assert_called_with(mock_android_env)
mock_controller.assert_called_with(mock_android_env, a11y_method=None)
mock_async_android_env.assert_called_with(mock_controller.return_value)


Expand Down
Loading