From 8c0c0b4ebe06a8aa1d0daef35300311b7694a8a5 Mon Sep 17 00:00:00 2001 From: Alexandros Schillings Date: Tue, 14 Jul 2015 15:04:31 +0100 Subject: [PATCH] Finalising before merging --- .idea/inspectionProfiles/Project_Default.xml | 1 + library/build.gradle | 37 ++++++++++++------ library/library.iml | 6 +++ library/src/main/AndroidManifest.xml | 16 +------- .../device/adrecord/AdRecord.java | 6 +-- .../ibeacon/IBeaconManufacturerData.java | 15 ++++--- .../resolvers/GattAttributeResolver.java | 2 +- .../alt236/bluetoothlelib/util/ByteUtils.java | 4 +- .../main/res/drawable-hdpi/ic_launcher.png | Bin 4501 -> 0 bytes .../main/res/drawable-mdpi/ic_launcher.png | Bin 2930 -> 0 bytes .../main/res/drawable-xhdpi/ic_launcher.png | Bin 6098 -> 0 bytes .../main/res/drawable-xxhdpi/ic_launcher.png | Bin 9428 -> 0 bytes library/src/main/res/values-v11/styles.xml | 11 ------ library/src/main/res/values-v14/styles.xml | 12 ------ library/src/main/res/values/strings.xml | 5 --- library/src/main/res/values/styles.xml | 20 ---------- sample_app/build.gradle | 15 +++---- sample_app/sample_app.iml | 2 + sample_app/src/main/AndroidManifest.xml | 8 +--- .../src/main/res/layout/list_item_device.xml | 4 +- sample_app/src/main/res/values/strings.xml | 3 +- 21 files changed, 61 insertions(+), 106 deletions(-) delete mode 100644 library/src/main/res/drawable-hdpi/ic_launcher.png delete mode 100644 library/src/main/res/drawable-mdpi/ic_launcher.png delete mode 100644 library/src/main/res/drawable-xhdpi/ic_launcher.png delete mode 100644 library/src/main/res/drawable-xxhdpi/ic_launcher.png delete mode 100644 library/src/main/res/values-v11/styles.xml delete mode 100644 library/src/main/res/values-v14/styles.xml delete mode 100644 library/src/main/res/values/strings.xml delete mode 100644 library/src/main/res/values/styles.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 22bce9e..198ad64 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -7,6 +7,7 @@