From 6619c1616abd38544e0cfab85bacfa403e59dbb6 Mon Sep 17 00:00:00 2001
From: Mark Scheel <mscheel@digitalconstruction.com>
Date: Mon, 28 Apr 2014 22:45:55 -0600
Subject: [PATCH] Updates for XE16 compatibility.  XE16 was released in April
 2014 and replaced XE12 from December 2013.  XE16 changes the way voice
 triggers are set up.  They now require a permission in the manifest and use a
 different trigger syntax.

---
 glass/AndroidManifest.xml              | 2 ++
 glass/res/xml/barcode_scanner_show.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/glass/AndroidManifest.xml b/glass/AndroidManifest.xml
index 2809c1960..0018b8d42 100644
--- a/glass/AndroidManifest.xml
+++ b/glass/AndroidManifest.xml
@@ -20,6 +20,8 @@
           android:versionName="0.2.0">
 
   <uses-permission android:name="android.permission.CAMERA"/>
+  <uses-permission android:name="com.google.android.glass.permission.DEVELOPMENT" />
+  
 
   <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19"/>
 
diff --git a/glass/res/xml/barcode_scanner_show.xml b/glass/res/xml/barcode_scanner_show.xml
index 94ca46b93..10b70140c 100644
--- a/glass/res/xml/barcode_scanner_show.xml
+++ b/glass/res/xml/barcode_scanner_show.xml
@@ -14,6 +14,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
-<trigger command="TRANSLATE_THIS">
+<trigger keyword="BARCODE SCANNER">
   <constraints camera="true" />
 </trigger>
\ No newline at end of file