Made sure project fully runnable / buildable with gradle using jitpac…

…k jswt dependencies instead of local project setup magic in a parent dir
stefanhaustein · Apr 19, 2017 · 498ff6c · 498ff6c
1 parent 415c8ce
commit 498ff6c
Show file tree

Hide file tree

Showing 255 changed files with 130 additions and 892 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ proguard/
 # Intellij
 
 *.iml
+.idea/
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,5 +16,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url 'https://jitpack.io' }
     }
 }
diff --git a/flowgrid-android-swt/build.gradle → flowgrid-android-legacy/build.gradle b/flowgrid-android-swt/build.gradle → flowgrid-android-legacy/build.gradle
@@ -5,11 +5,11 @@ android {
     buildToolsVersion "25.0.2"
 
     defaultConfig {
-        applicationId "org.kobjects.flowgrid"
+        applicationId "org.flowgrid"
-        minSdkVersion 17
+        minSdkVersion 9
         targetSdkVersion 25
-        versionCode 1
+        versionCode 11
-        versionName "1.0"
+        versionName "0.11"
     }
     buildTypes {
         release {
@@ -20,13 +20,8 @@ android {
 }
 
 dependencies {
-    provided 'com.google.android.things:androidthings:0.1-devpreview'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
-//    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':emoji')
     compile project(':flowgrid-core')
-    compile project(':flowgrid-swt-core')
-    compile project(':jswt-core')
-    compile project(':jswt-android')
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.1.0'
 }
-
diff --git a/flowgrid-android/libs/arduino-firmata.jar → ...d-android-legacy/libs/arduino-firmata.jar b/flowgrid-android/libs/arduino-firmata.jar → ...d-android-legacy/libs/arduino-firmata.jar
diff --git a/...roid/libs/usb-serial-for-android-v010.jar → ...gacy/libs/usb-serial-for-android-v010.jar b/...roid/libs/usb-serial-for-android-v010.jar → ...gacy/libs/usb-serial-for-android-v010.jar
diff --git a/flowgrid-android/license.txt → flowgrid-android-legacy/license.txt b/flowgrid-android/license.txt → flowgrid-android-legacy/license.txt
diff --git a/flowgrid-android-legacy/src/main/AndroidManifest.xml b/flowgrid-android-legacy/src/main/AndroidManifest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.flowgrid"
+    android:versionCode="0"
+    android:versionName="InsertedFromGradle" >
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />    
+
+<!-- Needed for pre-kitkat --> 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-sdk
+        android:minSdkVersion="15" 
+        android:targetSdkVersion="22" />        
+
+
+    <application
+        android:windowSoftInputMode="adjustPan"
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="FlowGrid"
+        android:theme="@style/FlowGridTheme">
+    <!--          android:theme="@style/FlowGridTheme">
+            android:theme="@android:style/Theme.Holo.Light"  -->
+
+        <activity android:name="org.flowgrid.android.BootActivity"
+                  android:label="FlowGrid"
+                  android:configChanges="orientation|screenSize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+            </intent-filter>
+            <meta-data
+                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+                android:resource="@xml/device_filter" />
+        </activity>
+
+        <activity
+            android:name="org.flowgrid.android.MainActivity"
+            android:label="FlowGrid"
+            android:configChanges="orientation|screenSize">
+            <intent-filter>
+                <action android:name="android.intent.action.RUN" />
+            </intent-filter>
+        </activity>
+
+        </application>
+
+</manifest>
diff --git a/flowgrid-android/src/main/assets/api.md → ...rid-android-legacy/src/main/assets/api.md b/flowgrid-android/src/main/assets/api.md → ...rid-android-legacy/src/main/assets/api.md
diff --git a/...-android/src/main/assets/documentation.md → ...d-legacy/src/main/assets/documentation.md b/...-android/src/main/assets/documentation.md → ...d-legacy/src/main/assets/documentation.md
diff --git a/.../main/assets/flowgrid-examples-master.zip → .../main/assets/flowgrid-examples-master.zip b/.../main/assets/flowgrid-examples-master.zip → .../main/assets/flowgrid-examples-master.zip
diff --git a/.../main/assets/flowgrid-missions-master.zip → .../main/assets/flowgrid-missions-master.zip b/.../main/assets/flowgrid-missions-master.zip → .../main/assets/flowgrid-missions-master.zip
diff --git a/...rc/main/assets/flowgrid-myname-master.zip → ...rc/main/assets/flowgrid-myname-master.zip b/...rc/main/assets/flowgrid-myname-master.zip → ...rc/main/assets/flowgrid-myname-master.zip
diff --git a/flowgrid-android/src/main/assets/ui.md → ...grid-android-legacy/src/main/assets/ui.md b/flowgrid-android/src/main/assets/ui.md → ...grid-android-legacy/src/main/assets/ui.md
diff --git a/.../java/android/widget/VerticalSeekBar.java → .../java/android/widget/VerticalSeekBar.java b/.../java/android/widget/VerticalSeekBar.java → .../java/android/widget/VerticalSeekBar.java
diff --git a/...logic/audio/io/EndianDataInputStream.java → ...logic/audio/io/EndianDataInputStream.java b/...logic/audio/io/EndianDataInputStream.java → ...logic/audio/io/EndianDataInputStream.java
diff --git a/...va/com/badlogic/audio/io/WaveDecoder.java → ...va/com/badlogic/audio/io/WaveDecoder.java b/...va/com/badlogic/audio/io/WaveDecoder.java → ...va/com/badlogic/audio/io/WaveDecoder.java
diff --git a/...m/mobidevelop/widget/SplitPaneLayout.java → ...m/mobidevelop/widget/SplitPaneLayout.java b/...m/mobidevelop/widget/SplitPaneLayout.java → ...m/mobidevelop/widget/SplitPaneLayout.java
diff --git a/...ava/org/flowgrid/android/AboutDialog.java → ...ava/org/flowgrid/android/AboutDialog.java b/...ava/org/flowgrid/android/AboutDialog.java → ...ava/org/flowgrid/android/AboutDialog.java
diff --git a/...flowgrid/android/AbstractListAdapter.java → ...flowgrid/android/AbstractListAdapter.java b/...flowgrid/android/AbstractListAdapter.java → ...flowgrid/android/AbstractListAdapter.java
diff --git a/...rg/flowgrid/android/ArtifactFragment.java → ...rg/flowgrid/android/ArtifactFragment.java b/...rg/flowgrid/android/ArtifactFragment.java → ...rg/flowgrid/android/ArtifactFragment.java
diff --git a/...flowgrid/android/ArtifactListAdapter.java → ...flowgrid/android/ArtifactListAdapter.java b/...flowgrid/android/ArtifactListAdapter.java → ...flowgrid/android/ArtifactListAdapter.java
diff --git a/...va/org/flowgrid/android/BootActivity.java → ...va/org/flowgrid/android/BootActivity.java b/...va/org/flowgrid/android/BootActivity.java → ...va/org/flowgrid/android/BootActivity.java
diff --git a/...in/java/org/flowgrid/android/Dialogs.java → ...in/java/org/flowgrid/android/Dialogs.java b/...in/java/org/flowgrid/android/Dialogs.java → ...in/java/org/flowgrid/android/Dialogs.java
diff --git a/...java/org/flowgrid/android/HelpDialog.java → ...java/org/flowgrid/android/HelpDialog.java b/...java/org/flowgrid/android/HelpDialog.java → ...java/org/flowgrid/android/HelpDialog.java
diff --git a/...flowgrid/android/IdentifierValidator.java → ...flowgrid/android/IdentifierValidator.java b/...flowgrid/android/IdentifierValidator.java → ...flowgrid/android/IdentifierValidator.java
diff --git a/...va/org/flowgrid/android/MainActivity.java → ...va/org/flowgrid/android/MainActivity.java b/...va/org/flowgrid/android/MainActivity.java → ...va/org/flowgrid/android/MainActivity.java
diff --git a/...java/org/flowgrid/android/MoveDialog.java → ...java/org/flowgrid/android/MoveDialog.java b/...java/org/flowgrid/android/MoveDialog.java → ...java/org/flowgrid/android/MoveDialog.java
diff --git a/...rg/flowgrid/android/PlatformFragment.java → ...rg/flowgrid/android/PlatformFragment.java b/...rg/flowgrid/android/PlatformFragment.java → ...rg/flowgrid/android/PlatformFragment.java
diff --git a/...ava/org/flowgrid/android/ResetDialog.java → ...ava/org/flowgrid/android/ResetDialog.java b/...ava/org/flowgrid/android/ResetDialog.java → ...ava/org/flowgrid/android/ResetDialog.java
diff --git a/...lowgrid/android/ResourceFileFragment.java → ...lowgrid/android/ResourceFileFragment.java b/...lowgrid/android/ResourceFileFragment.java → ...lowgrid/android/ResourceFileFragment.java
diff --git a/...n/java/org/flowgrid/android/Settings.java → ...n/java/org/flowgrid/android/Settings.java b/...n/java/org/flowgrid/android/Settings.java → ...n/java/org/flowgrid/android/Settings.java
diff --git a/...ava/org/flowgrid/android/UiTimerTask.java → ...ava/org/flowgrid/android/UiTimerTask.java b/...ava/org/flowgrid/android/UiTimerTask.java → ...ava/org/flowgrid/android/UiTimerTask.java
diff --git a/...main/java/org/flowgrid/android/Views.java → ...main/java/org/flowgrid/android/Views.java b/...main/java/org/flowgrid/android/Views.java → ...main/java/org/flowgrid/android/Views.java
diff --git a/...ain/java/org/flowgrid/android/Widget.java → ...ain/java/org/flowgrid/android/Widget.java b/...ain/java/org/flowgrid/android/Widget.java → ...ain/java/org/flowgrid/android/Widget.java
diff --git a/...flowgrid/android/api/AndroidApiSetup.java → ...flowgrid/android/api/AndroidApiSetup.java b/...flowgrid/android/api/AndroidApiSetup.java → ...flowgrid/android/api/AndroidApiSetup.java
diff --git a/.../org/flowgrid/android/api/CanvasView.java → .../org/flowgrid/android/api/CanvasView.java b/.../org/flowgrid/android/api/CanvasView.java → .../org/flowgrid/android/api/CanvasView.java
diff --git a/...grid/android/api/EmojiControlFactory.java → ...grid/android/api/EmojiControlFactory.java b/...grid/android/api/EmojiControlFactory.java → ...grid/android/api/EmojiControlFactory.java
diff --git a/...va/org/flowgrid/android/api/Graphics.java → ...va/org/flowgrid/android/api/Graphics.java b/...va/org/flowgrid/android/api/Graphics.java → ...va/org/flowgrid/android/api/Graphics.java
diff --git a/...a/org/flowgrid/android/api/ImageImpl.java → ...a/org/flowgrid/android/api/ImageImpl.java b/...a/org/flowgrid/android/api/ImageImpl.java → ...a/org/flowgrid/android/api/ImageImpl.java
diff --git a/...a/org/flowgrid/android/api/SoundImpl.java → ...a/org/flowgrid/android/api/SoundImpl.java b/...a/org/flowgrid/android/api/SoundImpl.java → ...a/org/flowgrid/android/api/SoundImpl.java
diff --git a/...n/java/org/flowgrid/android/api/Tone.java → ...n/java/org/flowgrid/android/api/Tone.java b/...n/java/org/flowgrid/android/api/Tone.java → ...n/java/org/flowgrid/android/api/Tone.java
diff --git a/...ndroid/classifier/ClassifierFragment.java → ...ndroid/classifier/ClassifierFragment.java b/...ndroid/classifier/ClassifierFragment.java → ...ndroid/classifier/ClassifierFragment.java
diff --git a/...d/android/classifier/ParameterDialog.java → ...d/android/classifier/ParameterDialog.java b/...d/android/classifier/ParameterDialog.java → ...d/android/classifier/ParameterDialog.java
diff --git a/.../classifier/VirtualOperationFragment.java → .../classifier/VirtualOperationFragment.java b/.../classifier/VirtualOperationFragment.java → .../classifier/VirtualOperationFragment.java
diff --git a/...assifier/VirtualOperationListAdapter.java → ...assifier/VirtualOperationListAdapter.java b/...assifier/VirtualOperationListAdapter.java → ...assifier/VirtualOperationListAdapter.java
diff --git a/.../flowgrid/android/data/ArrayFragment.java → .../flowgrid/android/data/ArrayFragment.java b/.../flowgrid/android/data/ArrayFragment.java → .../flowgrid/android/data/ArrayFragment.java
diff --git a/...org/flowgrid/android/data/DataDialog.java → ...org/flowgrid/android/data/DataDialog.java b/...org/flowgrid/android/data/DataDialog.java → ...org/flowgrid/android/data/DataDialog.java
diff --git a/...org/flowgrid/android/data/DataWidget.java → ...org/flowgrid/android/data/DataWidget.java b/...org/flowgrid/android/data/DataWidget.java → ...org/flowgrid/android/data/DataWidget.java
diff --git a/...owgrid/android/data/InstanceFragment.java → ...owgrid/android/data/InstanceFragment.java b/...owgrid/android/data/InstanceFragment.java → ...owgrid/android/data/InstanceFragment.java
diff --git a/...id/android/graphics/ArtifactDrawable.java → ...id/android/graphics/ArtifactDrawable.java b/...id/android/graphics/ArtifactDrawable.java → ...id/android/graphics/ArtifactDrawable.java
diff --git a/...org/flowgrid/android/graphics/Colors.java → ...org/flowgrid/android/graphics/Colors.java b/...org/flowgrid/android/graphics/Colors.java → ...org/flowgrid/android/graphics/Colors.java
diff --git a/...rg/flowgrid/android/graphics/Drawing.java → ...rg/flowgrid/android/graphics/Drawing.java b/...rg/flowgrid/android/graphics/Drawing.java → ...rg/flowgrid/android/graphics/Drawing.java
diff --git a/...owgrid/android/module/ModuleFragment.java → ...owgrid/android/module/ModuleFragment.java b/...owgrid/android/module/ModuleFragment.java → ...owgrid/android/module/ModuleFragment.java
diff --git a/...g/flowgrid/android/module/ModuleMenu.java → ...g/flowgrid/android/module/ModuleMenu.java b/...g/flowgrid/android/module/ModuleMenu.java → ...g/flowgrid/android/module/ModuleMenu.java
diff --git a/...lowgrid/android/module/StorageDialog.java → ...lowgrid/android/module/StorageDialog.java b/...lowgrid/android/module/StorageDialog.java → ...lowgrid/android/module/StorageDialog.java
diff --git a/.../operation/AbstractOperationFragment.java → .../operation/AbstractOperationFragment.java b/.../operation/AbstractOperationFragment.java → .../operation/AbstractOperationFragment.java
diff --git a/...owgrid/android/operation/CommandMenu.java → ...owgrid/android/operation/CommandMenu.java b/...owgrid/android/operation/CommandMenu.java → ...owgrid/android/operation/CommandMenu.java
diff --git a/...roid/operation/EditOperationFragment.java → ...roid/operation/EditOperationFragment.java b/...roid/operation/EditOperationFragment.java → ...roid/operation/EditOperationFragment.java
diff --git a/.../android/operation/EditOperationView.java → .../android/operation/EditOperationView.java b/.../android/operation/EditOperationView.java → .../android/operation/EditOperationView.java
diff --git a/...ndroid/operation/OperationHelpDialog.java → ...ndroid/operation/OperationHelpDialog.java b/...ndroid/operation/OperationHelpDialog.java → ...ndroid/operation/OperationHelpDialog.java
diff --git a/...droid/operation/RunOperationFragment.java → ...droid/operation/RunOperationFragment.java b/...droid/operation/RunOperationFragment.java → ...droid/operation/RunOperationFragment.java
diff --git a/...ndroid/operation/ScaledGraphElements.java → ...ndroid/operation/ScaledGraphElements.java b/...ndroid/operation/ScaledGraphElements.java → ...ndroid/operation/ScaledGraphElements.java
diff --git a/...grid/android/operation/SelectionView.java → ...grid/android/operation/SelectionView.java b/...grid/android/operation/SelectionView.java → ...grid/android/operation/SelectionView.java
diff --git a/...oid/operation/TutorialSettingsDialog.java → ...oid/operation/TutorialSettingsDialog.java b/...oid/operation/TutorialSettingsDialog.java → ...oid/operation/TutorialSettingsDialog.java
diff --git a/...rg/flowgrid/android/port/FirmataPort.java → ...rg/flowgrid/android/port/FirmataPort.java b/...rg/flowgrid/android/port/FirmataPort.java → ...rg/flowgrid/android/port/FirmataPort.java
diff --git a/...wgrid/android/port/FirmataPortDialog.java → ...wgrid/android/port/FirmataPortDialog.java b/...wgrid/android/port/FirmataPortDialog.java → ...wgrid/android/port/FirmataPortDialog.java
diff --git a/...rg/flowgrid/android/port/PortManager.java → ...rg/flowgrid/android/port/PortManager.java b/...rg/flowgrid/android/port/PortManager.java → ...rg/flowgrid/android/port/PortManager.java
diff --git a/...org/flowgrid/android/port/SensorPort.java → ...org/flowgrid/android/port/SensorPort.java b/...org/flowgrid/android/port/SensorPort.java → ...org/flowgrid/android/port/SensorPort.java
diff --git a/...ava/org/flowgrid/android/port/Sprite.java → ...ava/org/flowgrid/android/port/Sprite.java b/...ava/org/flowgrid/android/port/Sprite.java → ...ava/org/flowgrid/android/port/Sprite.java
diff --git a/...a/org/flowgrid/android/port/TestPort.java → ...a/org/flowgrid/android/port/TestPort.java b/...a/org/flowgrid/android/port/TestPort.java → ...a/org/flowgrid/android/port/TestPort.java
diff --git a/...flowgrid/android/port/TestPortDialog.java → ...flowgrid/android/port/TestPortDialog.java b/...flowgrid/android/port/TestPortDialog.java → ...flowgrid/android/port/TestPortDialog.java
diff --git a/...org/flowgrid/android/port/WidgetPort.java → ...org/flowgrid/android/port/WidgetPort.java b/...org/flowgrid/android/port/WidgetPort.java → ...org/flowgrid/android/port/WidgetPort.java
diff --git a/...owgrid/android/port/WidgetPortDialog.java → ...owgrid/android/port/WidgetPortDialog.java b/...owgrid/android/port/WidgetPortDialog.java → ...owgrid/android/port/WidgetPortDialog.java
diff --git a/...id/android/property/PropertyFragment.java → ...id/android/property/PropertyFragment.java b/...id/android/property/PropertyFragment.java → ...id/android/property/PropertyFragment.java
diff --git a/...lowgrid/android/type/ArrayTypeDialog.java → ...lowgrid/android/type/ArrayTypeDialog.java b/...lowgrid/android/type/ArrayTypeDialog.java → ...lowgrid/android/type/ArrayTypeDialog.java
diff --git a/...id/android/type/PrimitiveTypeSpinner.java → ...id/android/type/PrimitiveTypeSpinner.java b/...id/android/type/PrimitiveTypeSpinner.java → ...id/android/type/PrimitiveTypeSpinner.java
diff --git a/...org/flowgrid/android/type/TypeFilter.java → ...org/flowgrid/android/type/TypeFilter.java b/...org/flowgrid/android/type/TypeFilter.java → ...org/flowgrid/android/type/TypeFilter.java
diff --git a/...a/org/flowgrid/android/type/TypeMenu.java → ...a/org/flowgrid/android/type/TypeMenu.java b/...a/org/flowgrid/android/type/TypeMenu.java → ...a/org/flowgrid/android/type/TypeMenu.java
diff --git a/...rg/flowgrid/android/type/TypeSpinner.java → ...rg/flowgrid/android/type/TypeSpinner.java b/...rg/flowgrid/android/type/TypeSpinner.java → ...rg/flowgrid/android/type/TypeSpinner.java
diff --git a/...org/flowgrid/android/type/TypeWidget.java → ...org/flowgrid/android/type/TypeWidget.java b/...org/flowgrid/android/type/TypeWidget.java → ...org/flowgrid/android/type/TypeWidget.java
diff --git a/.../org/flowgrid/android/view/Histogram.java → .../org/flowgrid/android/view/Histogram.java b/.../org/flowgrid/android/view/Histogram.java → .../org/flowgrid/android/view/Histogram.java
diff --git a/...a/org/flowgrid/android/view/RunChart.java → ...a/org/flowgrid/android/view/RunChart.java b/...a/org/flowgrid/android/view/RunChart.java → ...a/org/flowgrid/android/view/RunChart.java
diff --git a/...wgrid/android/widget/CallbackSpinner.java → ...wgrid/android/widget/CallbackSpinner.java b/...wgrid/android/widget/CallbackSpinner.java → ...wgrid/android/widget/CallbackSpinner.java
diff --git a/...flowgrid/android/widget/ColumnLayout.java → ...flowgrid/android/widget/ColumnLayout.java b/...flowgrid/android/widget/ColumnLayout.java → ...flowgrid/android/widget/ColumnLayout.java
diff --git a/...android/widget/ColumnLayoutInterface.java → ...android/widget/ColumnLayoutInterface.java b/...android/widget/ColumnLayoutInterface.java → ...android/widget/ColumnLayoutInterface.java
diff --git a/.../flowgrid/android/widget/ContextMenu.java → .../flowgrid/android/widget/ContextMenu.java b/.../flowgrid/android/widget/ContextMenu.java → .../flowgrid/android/widget/ContextMenu.java
diff --git a/...g/flowgrid/android/widget/MetaLayout.java → ...g/flowgrid/android/widget/MetaLayout.java b/...g/flowgrid/android/widget/MetaLayout.java → ...g/flowgrid/android/widget/MetaLayout.java
diff --git a/...rawable-hdpi/ic_arrow_back_white_24dp.png → ...rawable-hdpi/ic_arrow_back_white_24dp.png b/...rawable-hdpi/ic_arrow_back_white_24dp.png → ...rawable-hdpi/ic_arrow_back_white_24dp.png
diff --git a/...res/drawable-hdpi/ic_clear_white_24dp.png → ...res/drawable-hdpi/ic_clear_white_24dp.png b/...res/drawable-hdpi/ic_clear_white_24dp.png → ...res/drawable-hdpi/ic_clear_white_24dp.png
diff --git a/...ble-hdpi/ic_cloud_download_white_24dp.png → ...ble-hdpi/ic_cloud_download_white_24dp.png b/...ble-hdpi/ic_cloud_download_white_24dp.png → ...ble-hdpi/ic_cloud_download_white_24dp.png
diff --git a/...drawable-hdpi/ic_cloud_off_white_24dp.png → ...drawable-hdpi/ic_cloud_off_white_24dp.png b/...drawable-hdpi/ic_cloud_off_white_24dp.png → ...drawable-hdpi/ic_cloud_off_white_24dp.png
diff --git a/...wable-hdpi/ic_content_copy_white_24dp.png → ...wable-hdpi/ic_content_copy_white_24dp.png b/...wable-hdpi/ic_content_copy_white_24dp.png → ...wable-hdpi/ic_content_copy_white_24dp.png
diff --git a/...awable-hdpi/ic_content_cut_white_24dp.png → ...awable-hdpi/ic_content_cut_white_24dp.png b/...awable-hdpi/ic_content_cut_white_24dp.png → ...awable-hdpi/ic_content_cut_white_24dp.png
diff --git a/...wable-hdpi/ic_fast_forward_white_24dp.png → ...wable-hdpi/ic_fast_forward_white_24dp.png b/...wable-hdpi/ic_fast_forward_white_24dp.png → ...wable-hdpi/ic_fast_forward_white_24dp.png
diff --git a/...able-hdpi/ic_import_export_white_24dp.png → ...able-hdpi/ic_import_export_white_24dp.png b/...able-hdpi/ic_import_export_white_24dp.png → ...able-hdpi/ic_import_export_white_24dp.png
diff --git a/...wable-hdpi/ic_info_outline_white_24dp.png → ...wable-hdpi/ic_info_outline_white_24dp.png b/...wable-hdpi/ic_info_outline_white_24dp.png → ...wable-hdpi/ic_info_outline_white_24dp.png
diff --git a/.../res/drawable-hdpi/ic_info_white_24dp.png → .../res/drawable-hdpi/ic_info_white_24dp.png b/.../res/drawable-hdpi/ic_info_white_24dp.png → .../res/drawable-hdpi/ic_info_white_24dp.png
diff --git a/...dpi/ic_keyboard_arrow_down_white_24dp.png → ...dpi/ic_keyboard_arrow_down_white_24dp.png b/...dpi/ic_keyboard_arrow_down_white_24dp.png → ...dpi/ic_keyboard_arrow_down_white_24dp.png
diff --git a/...-hdpi/ic_keyboard_arrow_up_white_24dp.png → ...-hdpi/ic_keyboard_arrow_up_white_24dp.png b/...-hdpi/ic_keyboard_arrow_up_white_24dp.png → ...-hdpi/ic_keyboard_arrow_up_white_24dp.png
diff --git a/.../src/main/res/mipmap-hdpi/ic_launcher.png → ...rc/main/res/drawable-hdpi/ic_launcher.png b/.../src/main/res/mipmap-hdpi/ic_launcher.png → ...rc/main/res/drawable-hdpi/ic_launcher.png
diff --git a/.../res/drawable-hdpi/ic_menu_white_24dp.png → .../res/drawable-hdpi/ic_menu_white_24dp.png b/.../res/drawable-hdpi/ic_menu_white_24dp.png → .../res/drawable-hdpi/ic_menu_white_24dp.png
diff --git a/...drawable-hdpi/ic_more_vert_white_24dp.png → ...drawable-hdpi/ic_more_vert_white_24dp.png b/...drawable-hdpi/ic_more_vert_white_24dp.png → ...drawable-hdpi/ic_more_vert_white_24dp.png
diff --git a/...drawable-hdpi/ic_more_vert_white_48dp.png → ...drawable-hdpi/ic_more_vert_white_48dp.png b/...drawable-hdpi/ic_more_vert_white_48dp.png → ...drawable-hdpi/ic_more_vert_white_48dp.png
diff --git a/...res/drawable-hdpi/ic_pause_white_24dp.png → ...res/drawable-hdpi/ic_pause_white_24dp.png b/...res/drawable-hdpi/ic_pause_white_24dp.png → ...res/drawable-hdpi/ic_pause_white_24dp.png
diff --git a/...rawable-hdpi/ic_play_arrow_white_24dp.png → ...rawable-hdpi/ic_play_arrow_white_24dp.png b/...rawable-hdpi/ic_play_arrow_white_24dp.png → ...rawable-hdpi/ic_play_arrow_white_24dp.png
diff --git a/...s/drawable-hdpi/ic_refresh_white_24dp.png → ...s/drawable-hdpi/ic_refresh_white_24dp.png b/...s/drawable-hdpi/ic_refresh_white_24dp.png → ...s/drawable-hdpi/ic_refresh_white_24dp.png
diff --git a/.../res/drawable-hdpi/ic_stop_white_24dp.png → .../res/drawable-hdpi/ic_stop_white_24dp.png b/.../res/drawable-hdpi/ic_stop_white_24dp.png → .../res/drawable-hdpi/ic_stop_white_24dp.png
diff --git a/...ldrtl-hdpi/ic_content_copy_white_24dp.png → ...ldrtl-hdpi/ic_content_copy_white_24dp.png b/...ldrtl-hdpi/ic_content_copy_white_24dp.png → ...ldrtl-hdpi/ic_content_copy_white_24dp.png
diff --git a/...ldrtl-mdpi/ic_content_copy_white_24dp.png → ...ldrtl-mdpi/ic_content_copy_white_24dp.png b/...ldrtl-mdpi/ic_content_copy_white_24dp.png → ...ldrtl-mdpi/ic_content_copy_white_24dp.png
diff --git a/...drtl-xhdpi/ic_content_copy_white_24dp.png → ...drtl-xhdpi/ic_content_copy_white_24dp.png b/...drtl-xhdpi/ic_content_copy_white_24dp.png → ...drtl-xhdpi/ic_content_copy_white_24dp.png
diff --git a/...rtl-xxhdpi/ic_content_copy_white_24dp.png → ...rtl-xxhdpi/ic_content_copy_white_24dp.png b/...rtl-xxhdpi/ic_content_copy_white_24dp.png → ...rtl-xxhdpi/ic_content_copy_white_24dp.png
diff --git a/...tl-xxxhdpi/ic_content_copy_white_24dp.png → ...tl-xxxhdpi/ic_content_copy_white_24dp.png b/...tl-xxxhdpi/ic_content_copy_white_24dp.png → ...tl-xxxhdpi/ic_content_copy_white_24dp.png
diff --git a/...rawable-mdpi/ic_arrow_back_white_24dp.png → ...rawable-mdpi/ic_arrow_back_white_24dp.png b/...rawable-mdpi/ic_arrow_back_white_24dp.png → ...rawable-mdpi/ic_arrow_back_white_24dp.png
diff --git a/...res/drawable-mdpi/ic_clear_white_24dp.png → ...res/drawable-mdpi/ic_clear_white_24dp.png b/...res/drawable-mdpi/ic_clear_white_24dp.png → ...res/drawable-mdpi/ic_clear_white_24dp.png
diff --git a/...ble-mdpi/ic_cloud_download_white_24dp.png → ...ble-mdpi/ic_cloud_download_white_24dp.png b/...ble-mdpi/ic_cloud_download_white_24dp.png → ...ble-mdpi/ic_cloud_download_white_24dp.png
diff --git a/...drawable-mdpi/ic_cloud_off_white_24dp.png → ...drawable-mdpi/ic_cloud_off_white_24dp.png b/...drawable-mdpi/ic_cloud_off_white_24dp.png → ...drawable-mdpi/ic_cloud_off_white_24dp.png
diff --git a/...wable-mdpi/ic_content_copy_white_24dp.png → ...wable-mdpi/ic_content_copy_white_24dp.png b/...wable-mdpi/ic_content_copy_white_24dp.png → ...wable-mdpi/ic_content_copy_white_24dp.png
diff --git a/...awable-mdpi/ic_content_cut_white_24dp.png → ...awable-mdpi/ic_content_cut_white_24dp.png b/...awable-mdpi/ic_content_cut_white_24dp.png → ...awable-mdpi/ic_content_cut_white_24dp.png
diff --git a/...wable-mdpi/ic_fast_forward_white_24dp.png → ...wable-mdpi/ic_fast_forward_white_24dp.png b/...wable-mdpi/ic_fast_forward_white_24dp.png → ...wable-mdpi/ic_fast_forward_white_24dp.png
diff --git a/...able-mdpi/ic_import_export_white_24dp.png → ...able-mdpi/ic_import_export_white_24dp.png b/...able-mdpi/ic_import_export_white_24dp.png → ...able-mdpi/ic_import_export_white_24dp.png
diff --git a/...wable-mdpi/ic_info_outline_white_24dp.png → ...wable-mdpi/ic_info_outline_white_24dp.png b/...wable-mdpi/ic_info_outline_white_24dp.png → ...wable-mdpi/ic_info_outline_white_24dp.png
diff --git a/.../res/drawable-mdpi/ic_info_white_24dp.png → .../res/drawable-mdpi/ic_info_white_24dp.png b/.../res/drawable-mdpi/ic_info_white_24dp.png → .../res/drawable-mdpi/ic_info_white_24dp.png
diff --git a/...dpi/ic_keyboard_arrow_down_white_24dp.png → ...dpi/ic_keyboard_arrow_down_white_24dp.png b/...dpi/ic_keyboard_arrow_down_white_24dp.png → ...dpi/ic_keyboard_arrow_down_white_24dp.png
diff --git a/...-mdpi/ic_keyboard_arrow_up_white_24dp.png → ...-mdpi/ic_keyboard_arrow_up_white_24dp.png b/...-mdpi/ic_keyboard_arrow_up_white_24dp.png → ...-mdpi/ic_keyboard_arrow_up_white_24dp.png
diff --git a/.../src/main/res/mipmap-mdpi/ic_launcher.png → ...rc/main/res/drawable-mdpi/ic_launcher.png b/.../src/main/res/mipmap-mdpi/ic_launcher.png → ...rc/main/res/drawable-mdpi/ic_launcher.png
diff --git a/.../res/drawable-mdpi/ic_menu_white_24dp.png → .../res/drawable-mdpi/ic_menu_white_24dp.png b/.../res/drawable-mdpi/ic_menu_white_24dp.png → .../res/drawable-mdpi/ic_menu_white_24dp.png
diff --git a/...drawable-mdpi/ic_more_vert_white_24dp.png → ...drawable-mdpi/ic_more_vert_white_24dp.png b/...drawable-mdpi/ic_more_vert_white_24dp.png → ...drawable-mdpi/ic_more_vert_white_24dp.png
diff --git a/...drawable-mdpi/ic_more_vert_white_48dp.png → ...drawable-mdpi/ic_more_vert_white_48dp.png b/...drawable-mdpi/ic_more_vert_white_48dp.png → ...drawable-mdpi/ic_more_vert_white_48dp.png
diff --git a/...res/drawable-mdpi/ic_pause_white_24dp.png → ...res/drawable-mdpi/ic_pause_white_24dp.png b/...res/drawable-mdpi/ic_pause_white_24dp.png → ...res/drawable-mdpi/ic_pause_white_24dp.png
diff --git a/...rawable-mdpi/ic_play_arrow_white_24dp.png → ...rawable-mdpi/ic_play_arrow_white_24dp.png b/...rawable-mdpi/ic_play_arrow_white_24dp.png → ...rawable-mdpi/ic_play_arrow_white_24dp.png
diff --git a/...s/drawable-mdpi/ic_refresh_white_24dp.png → ...s/drawable-mdpi/ic_refresh_white_24dp.png b/...s/drawable-mdpi/ic_refresh_white_24dp.png → ...s/drawable-mdpi/ic_refresh_white_24dp.png
diff --git a/.../res/drawable-mdpi/ic_stop_white_24dp.png → .../res/drawable-mdpi/ic_stop_white_24dp.png b/.../res/drawable-mdpi/ic_stop_white_24dp.png → .../res/drawable-mdpi/ic_stop_white_24dp.png
diff --git a/...awable-xhdpi/ic_arrow_back_white_24dp.png → ...awable-xhdpi/ic_arrow_back_white_24dp.png b/...awable-xhdpi/ic_arrow_back_white_24dp.png → ...awable-xhdpi/ic_arrow_back_white_24dp.png
diff --git a/...es/drawable-xhdpi/ic_clear_white_24dp.png → ...es/drawable-xhdpi/ic_clear_white_24dp.png b/...es/drawable-xhdpi/ic_clear_white_24dp.png → ...es/drawable-xhdpi/ic_clear_white_24dp.png
diff --git a/...le-xhdpi/ic_cloud_download_white_24dp.png → ...le-xhdpi/ic_cloud_download_white_24dp.png b/...le-xhdpi/ic_cloud_download_white_24dp.png → ...le-xhdpi/ic_cloud_download_white_24dp.png
diff --git a/...rawable-xhdpi/ic_cloud_off_white_24dp.png → ...rawable-xhdpi/ic_cloud_off_white_24dp.png b/...rawable-xhdpi/ic_cloud_off_white_24dp.png → ...rawable-xhdpi/ic_cloud_off_white_24dp.png
diff --git a/...able-xhdpi/ic_content_copy_white_24dp.png → ...able-xhdpi/ic_content_copy_white_24dp.png b/...able-xhdpi/ic_content_copy_white_24dp.png → ...able-xhdpi/ic_content_copy_white_24dp.png
diff --git a/...wable-xhdpi/ic_content_cut_white_24dp.png → ...wable-xhdpi/ic_content_cut_white_24dp.png b/...wable-xhdpi/ic_content_cut_white_24dp.png → ...wable-xhdpi/ic_content_cut_white_24dp.png
diff --git a/...able-xhdpi/ic_fast_forward_white_24dp.png → ...able-xhdpi/ic_fast_forward_white_24dp.png b/...able-xhdpi/ic_fast_forward_white_24dp.png → ...able-xhdpi/ic_fast_forward_white_24dp.png
diff --git a/...ble-xhdpi/ic_import_export_white_24dp.png → ...ble-xhdpi/ic_import_export_white_24dp.png b/...ble-xhdpi/ic_import_export_white_24dp.png → ...ble-xhdpi/ic_import_export_white_24dp.png
diff --git a/...able-xhdpi/ic_info_outline_white_24dp.png → ...able-xhdpi/ic_info_outline_white_24dp.png b/...able-xhdpi/ic_info_outline_white_24dp.png → ...able-xhdpi/ic_info_outline_white_24dp.png
diff --git a/...res/drawable-xhdpi/ic_info_white_24dp.png → ...res/drawable-xhdpi/ic_info_white_24dp.png b/...res/drawable-xhdpi/ic_info_white_24dp.png → ...res/drawable-xhdpi/ic_info_white_24dp.png
diff --git a/...dpi/ic_keyboard_arrow_down_white_24dp.png → ...dpi/ic_keyboard_arrow_down_white_24dp.png b/...dpi/ic_keyboard_arrow_down_white_24dp.png → ...dpi/ic_keyboard_arrow_down_white_24dp.png
diff --git a/...xhdpi/ic_keyboard_arrow_up_white_24dp.png → ...xhdpi/ic_keyboard_arrow_up_white_24dp.png b/...xhdpi/ic_keyboard_arrow_up_white_24dp.png → ...xhdpi/ic_keyboard_arrow_up_white_24dp.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...c/main/res/drawable-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...c/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/...res/drawable-xhdpi/ic_menu_white_24dp.png → ...res/drawable-xhdpi/ic_menu_white_24dp.png b/...res/drawable-xhdpi/ic_menu_white_24dp.png → ...res/drawable-xhdpi/ic_menu_white_24dp.png
diff --git a/...rawable-xhdpi/ic_more_vert_white_24dp.png → ...rawable-xhdpi/ic_more_vert_white_24dp.png b/...rawable-xhdpi/ic_more_vert_white_24dp.png → ...rawable-xhdpi/ic_more_vert_white_24dp.png
diff --git a/...rawable-xhdpi/ic_more_vert_white_48dp.png → ...rawable-xhdpi/ic_more_vert_white_48dp.png b/...rawable-xhdpi/ic_more_vert_white_48dp.png → ...rawable-xhdpi/ic_more_vert_white_48dp.png
diff --git a/...es/drawable-xhdpi/ic_pause_white_24dp.png → ...es/drawable-xhdpi/ic_pause_white_24dp.png b/...es/drawable-xhdpi/ic_pause_white_24dp.png → ...es/drawable-xhdpi/ic_pause_white_24dp.png
diff --git a/...awable-xhdpi/ic_play_arrow_white_24dp.png → ...awable-xhdpi/ic_play_arrow_white_24dp.png b/...awable-xhdpi/ic_play_arrow_white_24dp.png → ...awable-xhdpi/ic_play_arrow_white_24dp.png
diff --git a/.../drawable-xhdpi/ic_refresh_white_24dp.png → .../drawable-xhdpi/ic_refresh_white_24dp.png b/.../drawable-xhdpi/ic_refresh_white_24dp.png → .../drawable-xhdpi/ic_refresh_white_24dp.png
diff --git a/...res/drawable-xhdpi/ic_stop_white_24dp.png → ...res/drawable-xhdpi/ic_stop_white_24dp.png b/...res/drawable-xhdpi/ic_stop_white_24dp.png → ...res/drawable-xhdpi/ic_stop_white_24dp.png
diff --git a/...wable-xxhdpi/ic_arrow_back_white_24dp.png → ...wable-xxhdpi/ic_arrow_back_white_24dp.png b/...wable-xxhdpi/ic_arrow_back_white_24dp.png → ...wable-xxhdpi/ic_arrow_back_white_24dp.png
diff --git a/...s/drawable-xxhdpi/ic_clear_white_24dp.png → ...s/drawable-xxhdpi/ic_clear_white_24dp.png b/...s/drawable-xxhdpi/ic_clear_white_24dp.png → ...s/drawable-xxhdpi/ic_clear_white_24dp.png
diff --git a/...e-xxhdpi/ic_cloud_download_white_24dp.png → ...e-xxhdpi/ic_cloud_download_white_24dp.png b/...e-xxhdpi/ic_cloud_download_white_24dp.png → ...e-xxhdpi/ic_cloud_download_white_24dp.png
diff --git a/...awable-xxhdpi/ic_cloud_off_white_24dp.png → ...awable-xxhdpi/ic_cloud_off_white_24dp.png b/...awable-xxhdpi/ic_cloud_off_white_24dp.png → ...awable-xxhdpi/ic_cloud_off_white_24dp.png
diff --git a/...ble-xxhdpi/ic_content_copy_white_24dp.png → ...ble-xxhdpi/ic_content_copy_white_24dp.png b/...ble-xxhdpi/ic_content_copy_white_24dp.png → ...ble-xxhdpi/ic_content_copy_white_24dp.png
diff --git a/...able-xxhdpi/ic_content_cut_white_24dp.png → ...able-xxhdpi/ic_content_cut_white_24dp.png b/...able-xxhdpi/ic_content_cut_white_24dp.png → ...able-xxhdpi/ic_content_cut_white_24dp.png
diff --git a/...ble-xxhdpi/ic_fast_forward_white_24dp.png → ...ble-xxhdpi/ic_fast_forward_white_24dp.png b/...ble-xxhdpi/ic_fast_forward_white_24dp.png → ...ble-xxhdpi/ic_fast_forward_white_24dp.png
diff --git a/...le-xxhdpi/ic_import_export_white_24dp.png → ...le-xxhdpi/ic_import_export_white_24dp.png b/...le-xxhdpi/ic_import_export_white_24dp.png → ...le-xxhdpi/ic_import_export_white_24dp.png
diff --git a/...ble-xxhdpi/ic_info_outline_white_24dp.png → ...ble-xxhdpi/ic_info_outline_white_24dp.png b/...ble-xxhdpi/ic_info_outline_white_24dp.png → ...ble-xxhdpi/ic_info_outline_white_24dp.png
diff --git a/...es/drawable-xxhdpi/ic_info_white_24dp.png → ...es/drawable-xxhdpi/ic_info_white_24dp.png b/...es/drawable-xxhdpi/ic_info_white_24dp.png → ...es/drawable-xxhdpi/ic_info_white_24dp.png
diff --git a/...dpi/ic_keyboard_arrow_down_white_24dp.png → ...dpi/ic_keyboard_arrow_down_white_24dp.png b/...dpi/ic_keyboard_arrow_down_white_24dp.png → ...dpi/ic_keyboard_arrow_down_white_24dp.png
diff --git a/...xhdpi/ic_keyboard_arrow_up_white_24dp.png → ...xhdpi/ic_keyboard_arrow_up_white_24dp.png b/...xhdpi/ic_keyboard_arrow_up_white_24dp.png → ...xhdpi/ic_keyboard_arrow_up_white_24dp.png
diff --git a/...le-xxhdpi/ic_launch_operation_default.png → ...le-xxhdpi/ic_launch_operation_default.png b/...le-xxhdpi/ic_launch_operation_default.png → ...le-xxhdpi/ic_launch_operation_default.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → .../main/res/drawable-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → .../main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/...es/drawable-xxhdpi/ic_menu_white_24dp.png → ...es/drawable-xxhdpi/ic_menu_white_24dp.png b/...es/drawable-xxhdpi/ic_menu_white_24dp.png → ...es/drawable-xxhdpi/ic_menu_white_24dp.png
diff --git a/...awable-xxhdpi/ic_more_vert_white_24dp.png → ...awable-xxhdpi/ic_more_vert_white_24dp.png b/...awable-xxhdpi/ic_more_vert_white_24dp.png → ...awable-xxhdpi/ic_more_vert_white_24dp.png
diff --git a/...awable-xxhdpi/ic_more_vert_white_48dp.png → ...awable-xxhdpi/ic_more_vert_white_48dp.png b/...awable-xxhdpi/ic_more_vert_white_48dp.png → ...awable-xxhdpi/ic_more_vert_white_48dp.png
diff --git a/...s/drawable-xxhdpi/ic_pause_white_24dp.png → ...s/drawable-xxhdpi/ic_pause_white_24dp.png b/...s/drawable-xxhdpi/ic_pause_white_24dp.png → ...s/drawable-xxhdpi/ic_pause_white_24dp.png
diff --git a/...wable-xxhdpi/ic_play_arrow_white_24dp.png → ...wable-xxhdpi/ic_play_arrow_white_24dp.png b/...wable-xxhdpi/ic_play_arrow_white_24dp.png → ...wable-xxhdpi/ic_play_arrow_white_24dp.png
diff --git a/...drawable-xxhdpi/ic_refresh_white_24dp.png → ...drawable-xxhdpi/ic_refresh_white_24dp.png b/...drawable-xxhdpi/ic_refresh_white_24dp.png → ...drawable-xxhdpi/ic_refresh_white_24dp.png
diff --git a/...es/drawable-xxhdpi/ic_stop_white_24dp.png → ...es/drawable-xxhdpi/ic_stop_white_24dp.png b/...es/drawable-xxhdpi/ic_stop_white_24dp.png → ...es/drawable-xxhdpi/ic_stop_white_24dp.png
diff --git a/...able-xxxhdpi/ic_arrow_back_white_24dp.png → ...able-xxxhdpi/ic_arrow_back_white_24dp.png b/...able-xxxhdpi/ic_arrow_back_white_24dp.png → ...able-xxxhdpi/ic_arrow_back_white_24dp.png
diff --git a/.../drawable-xxxhdpi/ic_clear_white_24dp.png → .../drawable-xxxhdpi/ic_clear_white_24dp.png b/.../drawable-xxxhdpi/ic_clear_white_24dp.png → .../drawable-xxxhdpi/ic_clear_white_24dp.png
diff --git a/...-xxxhdpi/ic_cloud_download_white_24dp.png → ...-xxxhdpi/ic_cloud_download_white_24dp.png b/...-xxxhdpi/ic_cloud_download_white_24dp.png → ...-xxxhdpi/ic_cloud_download_white_24dp.png
diff --git a/...wable-xxxhdpi/ic_cloud_off_white_24dp.png → ...wable-xxxhdpi/ic_cloud_off_white_24dp.png b/...wable-xxxhdpi/ic_cloud_off_white_24dp.png → ...wable-xxxhdpi/ic_cloud_off_white_24dp.png
diff --git a/...le-xxxhdpi/ic_content_copy_white_24dp.png → ...le-xxxhdpi/ic_content_copy_white_24dp.png b/...le-xxxhdpi/ic_content_copy_white_24dp.png → ...le-xxxhdpi/ic_content_copy_white_24dp.png
diff --git a/...ble-xxxhdpi/ic_content_cut_white_24dp.png → ...ble-xxxhdpi/ic_content_cut_white_24dp.png b/...ble-xxxhdpi/ic_content_cut_white_24dp.png → ...ble-xxxhdpi/ic_content_cut_white_24dp.png
diff --git a/...le-xxxhdpi/ic_fast_forward_white_24dp.png → ...le-xxxhdpi/ic_fast_forward_white_24dp.png b/...le-xxxhdpi/ic_fast_forward_white_24dp.png → ...le-xxxhdpi/ic_fast_forward_white_24dp.png
diff --git a/...e-xxxhdpi/ic_import_export_white_24dp.png → ...e-xxxhdpi/ic_import_export_white_24dp.png b/...e-xxxhdpi/ic_import_export_white_24dp.png → ...e-xxxhdpi/ic_import_export_white_24dp.png
diff --git a/...le-xxxhdpi/ic_info_outline_white_24dp.png → ...le-xxxhdpi/ic_info_outline_white_24dp.png b/...le-xxxhdpi/ic_info_outline_white_24dp.png → ...le-xxxhdpi/ic_info_outline_white_24dp.png
diff --git a/...s/drawable-xxxhdpi/ic_info_white_24dp.png → ...s/drawable-xxxhdpi/ic_info_white_24dp.png b/...s/drawable-xxxhdpi/ic_info_white_24dp.png → ...s/drawable-xxxhdpi/ic_info_white_24dp.png
diff --git a/...dpi/ic_keyboard_arrow_down_white_24dp.png → ...dpi/ic_keyboard_arrow_down_white_24dp.png b/...dpi/ic_keyboard_arrow_down_white_24dp.png → ...dpi/ic_keyboard_arrow_down_white_24dp.png
diff --git a/...xhdpi/ic_keyboard_arrow_up_white_24dp.png → ...xhdpi/ic_keyboard_arrow_up_white_24dp.png b/...xhdpi/ic_keyboard_arrow_up_white_24dp.png → ...xhdpi/ic_keyboard_arrow_up_white_24dp.png
diff --git a/...s/drawable-xxxhdpi/ic_menu_white_24dp.png → ...s/drawable-xxxhdpi/ic_menu_white_24dp.png b/...s/drawable-xxxhdpi/ic_menu_white_24dp.png → ...s/drawable-xxxhdpi/ic_menu_white_24dp.png
diff --git a/...wable-xxxhdpi/ic_more_vert_white_24dp.png → ...wable-xxxhdpi/ic_more_vert_white_24dp.png b/...wable-xxxhdpi/ic_more_vert_white_24dp.png → ...wable-xxxhdpi/ic_more_vert_white_24dp.png
diff --git a/...wable-xxxhdpi/ic_more_vert_white_48dp.png → ...wable-xxxhdpi/ic_more_vert_white_48dp.png b/...wable-xxxhdpi/ic_more_vert_white_48dp.png → ...wable-xxxhdpi/ic_more_vert_white_48dp.png
diff --git a/.../drawable-xxxhdpi/ic_pause_white_24dp.png → .../drawable-xxxhdpi/ic_pause_white_24dp.png b/.../drawable-xxxhdpi/ic_pause_white_24dp.png → .../drawable-xxxhdpi/ic_pause_white_24dp.png
diff --git a/...able-xxxhdpi/ic_play_arrow_white_24dp.png → ...able-xxxhdpi/ic_play_arrow_white_24dp.png b/...able-xxxhdpi/ic_play_arrow_white_24dp.png → ...able-xxxhdpi/ic_play_arrow_white_24dp.png
diff --git a/...rawable-xxxhdpi/ic_refresh_white_24dp.png → ...rawable-xxxhdpi/ic_refresh_white_24dp.png b/...rawable-xxxhdpi/ic_refresh_white_24dp.png → ...rawable-xxxhdpi/ic_refresh_white_24dp.png
diff --git a/...s/drawable-xxxhdpi/ic_stop_white_24dp.png → ...s/drawable-xxxhdpi/ic_stop_white_24dp.png b/...s/drawable-xxxhdpi/ic_stop_white_24dp.png → ...s/drawable-xxxhdpi/ic_stop_white_24dp.png
diff --git a/...-android/src/main/res/drawable/bluffy.png → ...d-legacy/src/main/res/drawable/bluffy.png b/...-android/src/main/res/drawable/bluffy.png → ...d-legacy/src/main/res/drawable/bluffy.png
diff --git a/...roid/src/main/res/drawable/eyes_happy.png → ...gacy/src/main/res/drawable/eyes_happy.png b/...roid/src/main/res/drawable/eyes_happy.png → ...gacy/src/main/res/drawable/eyes_happy.png
diff --git a/...oid/src/main/res/drawable/eyes_normal.png → ...acy/src/main/res/drawable/eyes_normal.png b/...oid/src/main/res/drawable/eyes_normal.png → ...acy/src/main/res/drawable/eyes_normal.png
diff --git a/...-android/src/main/res/drawable/fluffy.png → ...d-legacy/src/main/res/drawable/fluffy.png b/...-android/src/main/res/drawable/fluffy.png → ...d-legacy/src/main/res/drawable/fluffy.png
diff --git a/...android/src/main/res/drawable/monster.png → ...-legacy/src/main/res/drawable/monster.png b/...android/src/main/res/drawable/monster.png → ...-legacy/src/main/res/drawable/monster.png
diff --git a/...oid/src/main/res/drawable/mouth_happy.png → ...acy/src/main/res/drawable/mouth_happy.png b/...oid/src/main/res/drawable/mouth_happy.png → ...acy/src/main/res/drawable/mouth_happy.png
diff --git a/...d/src/main/res/drawable/mouth_neutral.png → ...y/src/main/res/drawable/mouth_neutral.png b/...d/src/main/res/drawable/mouth_neutral.png → ...y/src/main/res/drawable/mouth_neutral.png
diff --git a/...d/src/main/res/drawable/mouth_unhappy.png → ...y/src/main/res/drawable/mouth_unhappy.png b/...d/src/main/res/drawable/mouth_unhappy.png → ...y/src/main/res/drawable/mouth_unhappy.png
diff --git a/...id/src/main/res/drawable/pipe_boolean.png → ...cy/src/main/res/drawable/pipe_boolean.png b/...id/src/main/res/drawable/pipe_boolean.png → ...cy/src/main/res/drawable/pipe_boolean.png
diff --git a/...oid/src/main/res/drawable/pipe_number.png → ...acy/src/main/res/drawable/pipe_number.png b/...oid/src/main/res/drawable/pipe_number.png → ...acy/src/main/res/drawable/pipe_number.png
diff --git a/...oid/src/main/res/drawable/pipe_string.png → ...acy/src/main/res/drawable/pipe_string.png b/...oid/src/main/res/drawable/pipe_string.png → ...acy/src/main/res/drawable/pipe_string.png
diff --git a/...d-android/src/main/res/drawable/robby.png → ...id-legacy/src/main/res/drawable/robby.png b/...d-android/src/main/res/drawable/robby.png → ...id-legacy/src/main/res/drawable/robby.png
diff --git a/...id-android/src/main/res/drawable/tube.png → ...oid-legacy/src/main/res/drawable/tube.png b/...id-android/src/main/res/drawable/tube.png → ...oid-legacy/src/main/res/drawable/tube.png
diff --git a/...grid-android/src/main/res/layout/root.xml → ...droid-legacy/src/main/res/layout/root.xml b/...grid-android/src/main/res/layout/root.xml → ...droid-legacy/src/main/res/layout/root.xml
diff --git a/flowgrid-android-legacy/src/main/res/mipmap-hdpi/ic_launcher.png b/flowgrid-android-legacy/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/flowgrid-android-legacy/src/main/res/mipmap-mdpi/ic_launcher.png b/flowgrid-android-legacy/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/flowgrid-android-legacy/src/main/res/mipmap-xhdpi/ic_launcher.png b/flowgrid-android-legacy/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/flowgrid-android-legacy/src/main/res/mipmap-xxhdpi/ic_launcher.png b/flowgrid-android-legacy/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...d-android/src/main/res/values/strings.xml → ...id-legacy/src/main/res/values/strings.xml b/...d-android/src/main/res/values/strings.xml → ...id-legacy/src/main/res/values/strings.xml
diff --git a/flowgrid-android-legacy/src/main/res/values/styles.xml b/flowgrid-android-legacy/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="FlowGridTheme" parent="Theme.AppCompat">
+        <!-- Customize your theme here. -->
+      <item name="colorPrimary">#ff0099cc</item>
+      <item name="colorPrimaryDark">#aa0099cc</item>
+    </style>
+
+
+</resources>
diff --git a/...ndroid/src/main/res/xml/device_filter.xml → ...legacy/src/main/res/xml/device_filter.xml b/...ndroid/src/main/res/xml/device_filter.xml → ...legacy/src/main/res/xml/device_filter.xml
diff --git a/flowgrid-android/todo.md → flowgrid-android-legacy/todo.md b/flowgrid-android/todo.md → flowgrid-android-legacy/todo.md
diff --git a/flowgrid-android/update-demos.sh → flowgrid-android-legacy/update-demos.sh b/flowgrid-android/update-demos.sh → flowgrid-android-legacy/update-demos.sh
diff --git a/flowgrid-android-swt/src/main/AndroidManifest.xml b/flowgrid-android-swt/src/main/AndroidManifest.xml
diff --git a/flowgrid-android-swt/src/main/res/values/styles.xml b/flowgrid-android-swt/src/main/res/values/styles.xml
diff --git a/flowgrid-android-swt/.gitignore → flowgrid-android/.gitignore b/flowgrid-android-swt/.gitignore → flowgrid-android/.gitignore
diff --git a/flowgrid-android/build.gradle b/flowgrid-android/build.gradle
@@ -5,11 +5,11 @@ android {
     buildToolsVersion "25.0.2"
 
     defaultConfig {
-        applicationId "org.flowgrid"
+        applicationId "org.kobjects.flowgrid"
-        minSdkVersion 9
+        minSdkVersion 17
         targetSdkVersion 25
-        versionCode 11
+        versionCode 1
-        versionName "0.11"
+        versionName "1.0"
     }
     buildTypes {
         release {
@@ -20,8 +20,15 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    provided 'com.google.android.things:androidthings:0.1-devpreview'
-    compile project(':emoji')
+//    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':flowgrid-core')
+    compile project(':flowgrid-swt-core')
+
+    compile "com.github.stefanhaustein.jswt:jswt-core:master-SNAPSHOT"
+    compile "com.github.stefanhaustein.jswt:jswt-android:master-SNAPSHOT"
+
+    testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.1.0'
 }
+
diff --git a/flowgrid-android-swt/proguard-rules.pro → flowgrid-android/proguard-rules.pro b/flowgrid-android-swt/proguard-rules.pro → flowgrid-android/proguard-rules.pro
diff --git a/flowgrid-android/src/main/AndroidManifest.xml b/flowgrid-android/src/main/AndroidManifest.xml
@@ -1,53 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.flowgrid"
+          package="org.flowgrid.android.swt.flowgrid">
-    android:versionCode="0"
-    android:versionName="InsertedFromGradle" >
-
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />    
-
-<!-- Needed for pre-kitkat --> 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-sdk
-        android:minSdkVersion="15" 
-        android:targetSdkVersion="22" />        
 
-
+    <application android:theme="@style/FlowGridTheme"
-    <application
+                 android:label="FlowGrid (SWT)">
-        android:windowSoftInputMode="adjustPan"
+        <uses-library android:name="com.google.android.things" android:required="false"/>
-        android:allowBackup="true"
+        <activity android:name="org.flowgrid.android.swt.MainActivity"
-        android:icon="@drawable/ic_launcher"
+                  android:screenOrientation="landscape" >
-        android:label="FlowGrid"
-        android:theme="@style/FlowGridTheme">
-    <!--          android:theme="@style/FlowGridTheme">
-            android:theme="@android:style/Theme.Holo.Light"  -->
-
-        <activity android:name="org.flowgrid.android.BootActivity"
-                  android:label="FlowGrid"
-                  android:configChanges="orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
-            </intent-filter>
-            <meta-data
-                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
-                android:resource="@xml/device_filter" />
-        </activity>
-
-        <activity
-            android:name="org.flowgrid.android.MainActivity"
-            android:label="FlowGrid"
-            android:configChanges="orientation|screenSize">
             <intent-filter>
-                <action android:name="android.intent.action.RUN" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.IOT_LAUNCHER"/>
             </intent-filter>
         </activity>
-
+    </application>
-        </application>
 
-</manifest>
+</manifest>
diff --git a/.../android/peripheralio/GpioOutputPort.java → .../android/peripheralio/GpioOutputPort.java b/.../android/peripheralio/GpioOutputPort.java → .../android/peripheralio/GpioOutputPort.java
diff --git a/...d/peripheralio/GpioOutputPortFactory.java → ...d/peripheralio/GpioOutputPortFactory.java b/...d/peripheralio/GpioOutputPortFactory.java → ...d/peripheralio/GpioOutputPortFactory.java
diff --git a/...droid/peripheralio/PeripheralIoSetup.java → ...droid/peripheralio/PeripheralIoSetup.java b/...droid/peripheralio/PeripheralIoSetup.java → ...droid/peripheralio/PeripheralIoSetup.java
diff --git a/...g/flowgrid/android/sensor/SensorPort.java → ...g/flowgrid/android/sensor/SensorPort.java b/...g/flowgrid/android/sensor/SensorPort.java → ...g/flowgrid/android/sensor/SensorPort.java
diff --git a/...rid/android/sensor/SensorPortFactory.java → ...rid/android/sensor/SensorPortFactory.java b/...rid/android/sensor/SensorPortFactory.java → ...rid/android/sensor/SensorPortFactory.java
diff --git a/.../flowgrid/android/sensor/SensorSetup.java → .../flowgrid/android/sensor/SensorSetup.java b/.../flowgrid/android/sensor/SensorSetup.java → .../flowgrid/android/sensor/SensorSetup.java
diff --git a/...rg/flowgrid/android/swt/MainActivity.java → ...rg/flowgrid/android/swt/MainActivity.java b/...rg/flowgrid/android/swt/MainActivity.java → ...rg/flowgrid/android/swt/MainActivity.java
diff --git a/flowgrid-android/src/main/res/drawable-hdpi/ic_launcher.png b/flowgrid-android/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/flowgrid-android/src/main/res/drawable-mdpi/ic_launcher.png b/flowgrid-android/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/flowgrid-android/src/main/res/drawable-xhdpi/ic_launcher.png b/flowgrid-android/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/flowgrid-android/src/main/res/drawable-xxhdpi/ic_launcher.png b/flowgrid-android/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/flowgrid-android/src/main/res/mipmap-hdpi/ic_launcher.png b/flowgrid-android/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/flowgrid-android/src/main/res/mipmap-mdpi/ic_launcher.png b/flowgrid-android/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/flowgrid-android/src/main/res/mipmap-xhdpi/ic_launcher.png b/flowgrid-android/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/flowgrid-android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/flowgrid-android/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...swt/src/main/res/values-w820dp/dimens.xml → ...oid/src/main/res/values-w820dp/dimens.xml b/...swt/src/main/res/values-w820dp/dimens.xml → ...oid/src/main/res/values-w820dp/dimens.xml
diff --git a/flowgrid-android/src/main/res/values/styles.xml b/flowgrid-android/src/main/res/values/styles.xml
@@ -1,11 +1,11 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="FlowGridTheme" parent="Theme.AppCompat">
+    <style name="FlowGridTheme" parent="Theme.AppCompat.NoActionBar">
         <!-- Customize your theme here. -->
-      <item name="colorPrimary">#ff0099cc</item>
+        <item name="colorPrimary">#ff0099cc</item>
-      <item name="colorPrimaryDark">#aa0099cc</item>
+        <item name="colorPrimaryDark">#aa0099cc</item>
+        <item name="colorAccent">#ffffbd21</item>
     </style>
 
-
 </resources>