Skip to content

Commit 94dbc75

Browse files
Show brand and model in device dropdown
1 parent 5c2ae52 commit 94dbc75

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

addons/android_device_explorer/device_explorer.gd

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ func _load_devices() -> void:
7171
var device_list := _get_devices()
7272
devices_btn.clear()
7373

74-
for d in device_list:
75-
devices_btn.add_item(d)
74+
for i in device_list.size():
75+
var id = device_list[i]
76+
var model := _run_adb(["-s", id, "shell", "getprop", "ro.product.model"]).strip_edges()
77+
var brand := _run_adb(["-s", id, "shell", "getprop", "ro.product.brand"]).strip_edges().capitalize()
78+
devices_btn.add_item(brand + " " + model, i)
79+
devices_btn.set_item_metadata(0, id)
7680

7781
if not device_list.is_empty():
7882
devices_btn.select(0)
@@ -83,7 +87,7 @@ func _load_devices() -> void:
8387

8488

8589
func _on_device_selected(index: int) -> void:
86-
current_device = devices_btn.get_item_text(index)
90+
current_device = devices_btn.get_item_metadata(index)
8791
_load_root()
8892

8993

0 commit comments

Comments
 (0)