Merge branch 'n' and update to API level 24

Fix #671.
2016-06-17 13:24:56 +08:00
parent d350088153 5966c9d874
commit b4d3103b8f
4 changed files with 73 additions and 5 deletions
@@ -48,6 +48,9 @@
                <category android:name="android.intent.category.LAUNCHER"/>
                <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
            </intent-filter>
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
        </activity>

        <activity
@@ -125,6 +128,14 @@
            </intent-filter>
        </service>

+        <service android:name=".ShadowsocksTileService" android:label="@string/app_name"
+                 android:icon="@drawable/ic_start_connected"
+                 android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
        <receiver android:name=".BootReceiver" android:enabled="false">
            <intent-filter>
                <action android:name="android.intent.action.BOOT_COMPLETED"/>