mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-22 18:07:55 +00:00
Code Issues Releases Wiki Activity

Parent activities where not correctly set

Browse Source 
BUG: 325060
This commit is contained in:
Albert Vaca 2013-09-18 17:27:52 +02:00
parent 5200ceaab5
commit 8800c4503c
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
KdeConnect/src/main/AndroidManifest.xml
View File

@ -32,6 +32,11 @@
android:label="KDE Connect" android:label="KDE Connect"
> >
<service
android:enabled="true"
android:name="org.kde.kdeconnect.BackgroundService">
</service>
<activity <activity
android:theme="@style/Theme.AppCompat" android:theme="@style/Theme.AppCompat"
android:name="org.kde.kdeconnect.UserInterface.MainActivity" android:name="org.kde.kdeconnect.UserInterface.MainActivity"
@ -48,57 +53,33 @@
android:theme="@style/Theme.AppCompat" android:theme="@style/Theme.AppCompat"
android:name="org.kde.kdeconnect.UserInterface.DeviceActivity" android:name="org.kde.kdeconnect.UserInterface.DeviceActivity"
android:label="@string/device" android:label="@string/device"
android:parentActivityName="org.kde.connect.UserInterface.MainActivity" android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
> >
<meta-data android:name="android.support.PARENT_ACTIVITY" <meta-data android:name="android.support.PARENT_ACTIVITY"
android:value="org.kde.connect.UserInterface.MainActivity" /> android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
</activity> </activity>
<activity <activity
android:theme="@style/Theme.AppCompat" android:theme="@style/Theme.AppCompat"
android:name="org.kde.kdeconnect.UserInterface.PairActivity" android:name="org.kde.kdeconnect.UserInterface.PairActivity"
android:label="@string/pair_device" android:label="@string/pair_device"
android:parentActivityName="org.kde.connect.UserInterface.MainActivity" android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
> >
<meta-data android:name="android.support.PARENT_ACTIVITY" <meta-data android:name="android.support.PARENT_ACTIVITY"
android:value="org.kde.connect.UserInterface.MainActivity" /> android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
</activity> </activity>
<activity
android:theme="@style/Theme.AppCompat"
android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
android:label="@string/remote_control"
>
<meta-data android:name="android.support.PARENT_ACTIVITY"
android:value=".DeviceActivity" />
</activity>
<activity <activity
android:name="org.kde.kdeconnect.UserInterface.SettingsActivity" android:name="org.kde.kdeconnect.UserInterface.SettingsActivity"
android:label="@string/settings" android:label="@string/settings"
android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
> >
<meta-data android:name="android.support.PARENT_ACTIVITY" <meta-data android:name="android.support.PARENT_ACTIVITY"
android:value=".DeviceActivity" /> android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
</activity> </activity>
<service
android:enabled="true"
android:name="org.kde.kdeconnect.BackgroundService">
</service>
<service android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
<intent-filter>
<action android:name="android.service.notification.NotificationListenerService" />
</intent-filter>
</service>
<receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver"> <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.PACKAGE_REPLACED" /> <action android:name="android.intent.action.PACKAGE_REPLACED" />
@ -124,6 +105,26 @@
</intent-filter>--> </intent-filter>-->
</receiver> </receiver>
<!-- Plugin-related activities and services -->
<activity
android:theme="@style/Theme.AppCompat"
android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
android:label="@string/remote_control"
android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
>
<meta-data android:name="android.support.PARENT_ACTIVITY"
android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
</activity>
<service android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
<intent-filter>
<action android:name="android.service.notification.NotificationListenerService" />
</intent-filter>
</service>
</application> </application>
</manifest> </manifest>