From 9b2c892fac76aba7794e4a698193715dd328b0e6 Mon Sep 17 00:00:00 2001 From: shts Date: Tue, 4 Aug 2015 02:08:04 +0900 Subject: [PATCH] version 0.9.6 --- app/build.gradle | 4 +- app/manifest-merger-release-report.txt | 118 +++++++++++++------------ 2 files changed, 65 insertions(+), 57 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 57f2e10..099f7a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "shts.jp.android.nogifeed" minSdkVersion 10 targetSdkVersion 21 - versionCode 8 - versionName "0.9.5" + versionCode 9 + versionName "0.9.6" } buildTypes { debug { diff --git a/app/manifest-merger-release-report.txt b/app/manifest-merger-release-report.txt index d656e07..20aa60d 100644 --- a/app/manifest-merger-release-report.txt +++ b/app/manifest-merger-release-report.txt @@ -164,7 +164,7 @@ ADDED from AndroidManifest.xml:74:9 ADDED from AndroidManifest.xml:76:13 android:name ADDED from AndroidManifest.xml:75:13 -activity#shts.jp.android.nogifeed.activities.MemberListActivity +activity#shts.jp.android.nogifeed.activities.NewsBrowseActivity ADDED from AndroidManifest.xml:79:9 android:screenOrientation ADDED from AndroidManifest.xml:82:13 @@ -172,114 +172,122 @@ ADDED from AndroidManifest.xml:79:9 ADDED from AndroidManifest.xml:81:13 android:name ADDED from AndroidManifest.xml:80:13 +activity#shts.jp.android.nogifeed.activities.MemberListActivity +ADDED from AndroidManifest.xml:84:9 + android:screenOrientation + ADDED from AndroidManifest.xml:87:13 + android:label + ADDED from AndroidManifest.xml:86:13 + android:name + ADDED from AndroidManifest.xml:85:13 intent-filter#android.appwidget.action.APPWIDGET_CONFIGURE -ADDED from AndroidManifest.xml:83:13 +ADDED from AndroidManifest.xml:88:13 action#android.appwidget.action.APPWIDGET_CONFIGURE -ADDED from AndroidManifest.xml:84:17 +ADDED from AndroidManifest.xml:89:17 android:name - ADDED from AndroidManifest.xml:84:25 + ADDED from AndroidManifest.xml:89:25 provider#shts.jp.android.nogifeed.providers.NogiFeedProvider -ADDED from AndroidManifest.xml:88:9 +ADDED from AndroidManifest.xml:93:9 android:authorities - ADDED from AndroidManifest.xml:89:13 + ADDED from AndroidManifest.xml:94:13 android:name - ADDED from AndroidManifest.xml:90:13 + ADDED from AndroidManifest.xml:95:13 service#com.parse.PushService -ADDED from AndroidManifest.xml:93:9 +ADDED from AndroidManifest.xml:98:9 android:name - ADDED from AndroidManifest.xml:93:18 + ADDED from AndroidManifest.xml:98:18 receiver#com.parse.ParseBroadcastReceiver -ADDED from AndroidManifest.xml:94:9 +ADDED from AndroidManifest.xml:99:9 android:name - ADDED from AndroidManifest.xml:94:19 + ADDED from AndroidManifest.xml:99:19 intent-filter#android.intent.action.BOOT_COMPLETED+android.intent.action.USER_PRESENT -ADDED from AndroidManifest.xml:95:13 +ADDED from AndroidManifest.xml:100:13 action#android.intent.action.BOOT_COMPLETED -ADDED from AndroidManifest.xml:96:17 +ADDED from AndroidManifest.xml:101:17 android:name - ADDED from AndroidManifest.xml:96:25 + ADDED from AndroidManifest.xml:101:25 action#android.intent.action.USER_PRESENT -ADDED from AndroidManifest.xml:97:17 +ADDED from AndroidManifest.xml:102:17 android:name - ADDED from AndroidManifest.xml:97:25 + ADDED from AndroidManifest.xml:102:25 receiver#com.parse.ParsePushBroadcastReceiver -ADDED from AndroidManifest.xml:100:9 +ADDED from AndroidManifest.xml:105:9 android:exported - ADDED from AndroidManifest.xml:101:13 + ADDED from AndroidManifest.xml:106:13 android:name - ADDED from AndroidManifest.xml:100:19 + ADDED from AndroidManifest.xml:105:19 intent-filter#com.parse.push.intent.DELETE+com.parse.push.intent.OPEN+com.parse.push.intent.RECEIVE -ADDED from AndroidManifest.xml:102:13 +ADDED from AndroidManifest.xml:107:13 action#com.parse.push.intent.RECEIVE -ADDED from AndroidManifest.xml:103:17 +ADDED from AndroidManifest.xml:108:17 android:name - ADDED from AndroidManifest.xml:103:25 + ADDED from AndroidManifest.xml:108:25 action#com.parse.push.intent.DELETE -ADDED from AndroidManifest.xml:104:17 +ADDED from AndroidManifest.xml:109:17 android:name - ADDED from AndroidManifest.xml:104:25 + ADDED from AndroidManifest.xml:109:25 action#com.parse.push.intent.OPEN -ADDED from AndroidManifest.xml:105:17 +ADDED from AndroidManifest.xml:110:17 android:name - ADDED from AndroidManifest.xml:105:25 + ADDED from AndroidManifest.xml:110:25 receiver#com.parse.GcmBroadcastReceiver -ADDED from AndroidManifest.xml:108:9 +ADDED from AndroidManifest.xml:113:9 android:permission - ADDED from AndroidManifest.xml:109:13 + ADDED from AndroidManifest.xml:114:13 android:name - ADDED from AndroidManifest.xml:108:19 + ADDED from AndroidManifest.xml:113:19 intent-filter#com.google.android.c2dm.intent.RECEIVE+com.google.android.c2dm.intent.REGISTRATION+shts.jp.android.nogifeed -ADDED from AndroidManifest.xml:110:13 +ADDED from AndroidManifest.xml:115:13 action#com.google.android.c2dm.intent.RECEIVE -ADDED from AndroidManifest.xml:111:17 +ADDED from AndroidManifest.xml:116:17 android:name - ADDED from AndroidManifest.xml:111:25 + ADDED from AndroidManifest.xml:116:25 action#com.google.android.c2dm.intent.REGISTRATION -ADDED from AndroidManifest.xml:112:17 +ADDED from AndroidManifest.xml:117:17 android:name - ADDED from AndroidManifest.xml:112:25 + ADDED from AndroidManifest.xml:117:25 category#shts.jp.android.nogifeed -ADDED from AndroidManifest.xml:119:17 +ADDED from AndroidManifest.xml:124:17 android:name - ADDED from AndroidManifest.xml:119:27 + ADDED from AndroidManifest.xml:124:27 receiver#shts.jp.android.nogifeed.receivers.FromParseReceiver -ADDED from AndroidManifest.xml:124:9 +ADDED from AndroidManifest.xml:129:9 android:exported - ADDED from AndroidManifest.xml:124:87 + ADDED from AndroidManifest.xml:129:87 android:name - ADDED from AndroidManifest.xml:124:19 + ADDED from AndroidManifest.xml:129:19 intent-filter#android.shts.jp.nogifeed.UPDATE_STATUS -ADDED from AndroidManifest.xml:125:13 +ADDED from AndroidManifest.xml:130:13 action#android.shts.jp.nogifeed.UPDATE_STATUS -ADDED from AndroidManifest.xml:126:17 +ADDED from AndroidManifest.xml:131:17 android:name - ADDED from AndroidManifest.xml:126:25 + ADDED from AndroidManifest.xml:131:25 receiver#shts.jp.android.nogifeed.widget.ProfileWidgetProvider -ADDED from AndroidManifest.xml:131:9 +ADDED from AndroidManifest.xml:136:9 android:name - ADDED from AndroidManifest.xml:131:19 + ADDED from AndroidManifest.xml:136:19 intent-filter#android.appwidget.action.APPWIDGET_UPDATE -ADDED from AndroidManifest.xml:132:13 +ADDED from AndroidManifest.xml:137:13 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from AndroidManifest.xml:133:17 +ADDED from AndroidManifest.xml:138:17 android:name - ADDED from AndroidManifest.xml:133:25 + ADDED from AndroidManifest.xml:138:25 meta-data#android.appwidget.provider -ADDED from AndroidManifest.xml:135:13 +ADDED from AndroidManifest.xml:140:13 android:resource - ADDED from AndroidManifest.xml:137:17 + ADDED from AndroidManifest.xml:142:17 android:name - ADDED from AndroidManifest.xml:136:17 + ADDED from AndroidManifest.xml:141:17 receiver#shts.jp.android.nogifeed.widget.ProfileWidgetIntentReceiver -ADDED from AndroidManifest.xml:139:9 +ADDED from AndroidManifest.xml:144:9 android:name - ADDED from AndroidManifest.xml:139:19 + ADDED from AndroidManifest.xml:144:19 intent-filter#shts.jp.android.nogifeed.widget.ProfileWidgetProvider.CLICK -ADDED from AndroidManifest.xml:140:13 +ADDED from AndroidManifest.xml:145:13 action#shts.jp.android.nogifeed.widget.ProfileWidgetProvider.CLICK -ADDED from AndroidManifest.xml:141:17 +ADDED from AndroidManifest.xml:146:17 android:name - ADDED from AndroidManifest.xml:141:25 + ADDED from AndroidManifest.xml:146:25 uses-sdk INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested MERGED from com.android.support:appcompat-v7:21.0.3:15:5