From bdbf949dacd401a39bbe9bd56da5c17997b71870 Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Thu, 23 Jun 2016 12:30:19 +0200
Subject: [PATCH] android: remove left over things from shashlik

---
 android/.idea/workspace.xml                   | 44 +++++++++----------
 .../java/org/anbox/NotificationListener.java  |  2 +-
 android/res/values/strings.xml                |  7 +--
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/android/.idea/workspace.xml b/android/.idea/workspace.xml
index d09d252..7ed7a40 100644
--- a/android/.idea/workspace.xml
+++ b/android/.idea/workspace.xml
@@ -48,7 +48,7 @@
         </entry>
       </file>
       <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/MainApplication.java">
+        <entry file="file://$PROJECT_DIR$/java/org/anbox/MainApplication.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
               <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
@@ -61,7 +61,7 @@
         </entry>
       </file>
       <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/MainActivity.java">
+        <entry file="file://$PROJECT_DIR$/java/org/anbox/MainActivity.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
               <caret line="9" column="44" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
@@ -71,7 +71,7 @@
         </entry>
       </file>
       <file leaf-file-name="KeyButtonView.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/KeyButtonView.java">
+        <entry file="file://$PROJECT_DIR$/java/org/anbox/KeyButtonView.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
               <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -83,7 +83,7 @@
         </entry>
       </file>
       <file leaf-file-name="BootReceiver.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/BootReceiver.java">
+        <entry file="file://$PROJECT_DIR$/java/org/anbox/BootReceiver.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
               <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
@@ -93,7 +93,7 @@
         </entry>
       </file>
       <file leaf-file-name="NavigationBarView.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/NavigationBarView.java">
+        <entry file="file://$PROJECT_DIR$/java/org/anbox/NavigationBarView.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
               <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
@@ -107,7 +107,7 @@
         </entry>
       </file>
       <file leaf-file-name="NavBar.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/NavBar.java">
+        <entry file="file://$PROJECT_DIR$/java/org/anbox/NavBar.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
               <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -117,7 +117,7 @@
         </entry>
       </file>
       <file leaf-file-name="NotificationListener.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/NotificationListener.java">
+        <entry file="file://$PROJECT_DIR$/java/org/anbox/NotificationListener.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
               <caret line="9" column="71" selection-start-line="9" selection-start-column="71" selection-end-line="9" selection-end-column="71" />
@@ -139,11 +139,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/java/org/anbox/shashlikssytem/MainApplication.java" />
-        <option value="$PROJECT_DIR$/java/org/anbox/shashlikssytem/NavigationBarView.java" />
-        <option value="$PROJECT_DIR$/java/org/anbox/shashlikssytem/NotificationListener.java" />
-        <option value="$PROJECT_DIR$/java/org/anbox/shashlikssytem/MainActivity.java" />
-        <option value="$PROJECT_DIR$/java/org/anbox/shashlikssytem/BootReceiver.java" />
+        <option value="$PROJECT_DIR$/java/org/anbox/MainApplication.java" />
+        <option value="$PROJECT_DIR$/java/org/anbox/NavigationBarView.java" />
+        <option value="$PROJECT_DIR$/java/org/anbox/NotificationListener.java" />
+        <option value="$PROJECT_DIR$/java/org/anbox/MainActivity.java" />
+        <option value="$PROJECT_DIR$/java/org/anbox/BootReceiver.java" />
       </list>
     </option>
   </component>
@@ -217,10 +217,6 @@
               <option name="myItemId" value="anbox" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="shashlikssytem" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
@@ -529,7 +525,7 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/NavigationBarView.java">
+    <entry file="file://$PROJECT_DIR$/java/org/anbox/NavigationBarView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
@@ -541,7 +537,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/NavBar.java">
+    <entry file="file://$PROJECT_DIR$/java/org/anbox/NavBar.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -549,7 +545,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/NotificationListener.java">
+    <entry file="file://$PROJECT_DIR$/java/org/anbox/NotificationListener.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="9" column="71" selection-start-line="9" selection-start-column="71" selection-end-line="9" selection-end-column="71" />
@@ -557,7 +553,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/MainApplication.java">
+    <entry file="file://$PROJECT_DIR$/java/org/anbox/MainApplication.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
@@ -568,7 +564,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/MainActivity.java">
+    <entry file="file://$PROJECT_DIR$/java/org/anbox/MainActivity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="9" column="44" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
@@ -576,7 +572,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/KeyButtonView.java">
+    <entry file="file://$PROJECT_DIR$/java/org/anbox/KeyButtonView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -586,7 +582,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/java/org/anbox/shashlikssytem/BootReceiver.java">
+    <entry file="file://$PROJECT_DIR$/java/org/anbox/BootReceiver.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
@@ -677,4 +673,4 @@
       </state>
     </states>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/android/java/org/anbox/NotificationListener.java b/android/java/org/anbox/NotificationListener.java
index df34b6a..cc55dfa 100644
--- a/android/java/org/anbox/NotificationListener.java
+++ b/android/java/org/anbox/NotificationListener.java
@@ -23,6 +23,6 @@ public class NotificationListener extends NotificationListenerService {
 
     @Override
     public void onNotificationPosted(StatusBarNotification sbn) {
-        Log.e("ShashlikController", "new notification");
+        Log.e("Anbox", "new notification");
     }
 }
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 788a202..fcc107f 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,8 +1,5 @@
 <resources>
-    <string name="app_name">ShashlikSsytem</string>
-
-    <string name="hello_world">Hello world!</string>
+    <string name="app_name">Anbox</string>
     <string name="action_settings">Settings</string>
-    <string name="service_name">Shashlik Service</string>
-
+    <string name="service_name">Anbox Service</string>
 </resources>