From 2af2d1aa31caa534c419e72d75daa667ff725de2 Mon Sep 17 00:00:00 2001
From: kg <kjxstar@gmail.com>
Date: Tue, 5 Dec 2017 07:08:07 +0800
Subject: add autocomplete for adb -s option (#6121)

---
 plugins/adb/README.md |  2 +-
 plugins/adb/_adb      | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'plugins/adb')

diff --git a/plugins/adb/README.md b/plugins/adb/README.md
index 075beec0e..83dcc7288 100644
--- a/plugins/adb/README.md
+++ b/plugins/adb/README.md
@@ -1,7 +1,7 @@
 # adb autocomplete plugin
 
 * Adds autocomplete options for all adb commands.
-
+* Add autocomplete for `adb -s`
 
 ## Requirements
 
diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index 5f37bedac..2e3c3658e 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -43,11 +43,20 @@ local expl
 local -a pkgs installed_pkgs
 
 _arguments \
+	'-s[devices]:specify device:->specify_device' \
 	'*:: :->subcmds' && return 0
 
+case "$state" in
+	specify_device)
+	_values  'devices' $(adb devices|awk 'NR>1&& $1 ~ /^[a-zA-Z0-9].*$/ \
+		{printf "%s[Device_%d:%s] ",$1,++i,$2 }')
+	return
+	;;
+esac
+
 if (( CURRENT == 1 )); then
 	_describe -t commands "adb subcommand" _1st_arguments
 	return
 fi
 
-_files
+_files
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From e999f104e74039b291070af435a494a88eb7d704 Mon Sep 17 00:00:00 2001
From: kg <kjxstar@gmail.com>
Date: Fri, 8 Dec 2017 07:52:52 +0800
Subject: Update adb (#6472)

---
 plugins/adb/_adb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/adb')

diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index 2e3c3658e..8cbf6593c 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -48,8 +48,8 @@ _arguments \
 
 case "$state" in
 	specify_device)
-	_values  'devices' $(adb devices|awk 'NR>1&& $1 ~ /^[a-zA-Z0-9].*$/ \
-		{printf "%s[Device_%d:%s] ",$1,++i,$2 }')
+	_values  'devices' $(adb devices -l|awk 'NR>1&& $1 ~ /^[a-zA-Z0-9].*$/ \
+		{printf "%s[%s] ",$1,$6 }')
 	return
 	;;
 esac
-- 
cgit v1.2.3-70-g09d2