Merge pull request #12 from moneymanagerex/dev

merge branch dev into master
moneymanagerex · Oct 27, 2014 · c569925 · c569925
2 parents e042785 + 1a63888
commit c569925
Show file tree

Hide file tree

Showing 72 changed files with 6,107 additions and 7,259 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -23,7 +23,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
@@ -105,16 +105,6 @@
             android:exported="true">
         </provider>
 
-        <service android:name="net.robotmedia.billing.BillingService"/>
-
-        <receiver android:name="net.robotmedia.billing.BillingReceiver">
-            <intent-filter>
-                <action android:name="com.android.vending.billing.IN_APP_NOTIFY"/>
-                <action android:name="com.android.vending.billing.RESPONSE_CODE"/>
-                <action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED"/>
-            </intent-filter>
-        </receiver>
-
         <service
             android:name=".widget.SummaryDashExtension"
             android:icon="@drawable/ic_stat_notification"
@@ -164,7 +154,7 @@
                 <!-- Samsung MultiWindow Function -->
                 <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER"/>
             </intent-filter>
-            <intent-filter android:label="@string/app_name">
+            <intent-filter android:label="@string/application_name">
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>

diff --git a/androidbillinglibrary/.classpath b/androidbillinglibrary/.classpath
diff --git a/androidbillinglibrary/.gitignore b/androidbillinglibrary/.gitignore
diff --git a/androidbillinglibrary/.project b/androidbillinglibrary/.project
diff --git a/androidbillinglibrary/AndroidManifest.xml b/androidbillinglibrary/AndroidManifest.xml
diff --git a/androidbillinglibrary/build.gradle b/androidbillinglibrary/build.gradle
diff --git a/androidbillinglibrary/proguard.cfg b/androidbillinglibrary/proguard.cfg
diff --git a/androidbillinglibrary/project.properties b/androidbillinglibrary/project.properties
diff --git a/androidbillinglibrary/res/values/strings.xml b/androidbillinglibrary/res/values/strings.xml
diff --git a/androidbillinglibrary/src/com/android/vending/billing/IMarketBillingService.aidl b/androidbillinglibrary/src/com/android/vending/billing/IMarketBillingService.aidl