MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-25 01:55:50 +01:00
Code Releases Wiki Activity

Use parentActivityName instead of android.support.PARENT_ACTIVITY

Browse Source 
(the latter doesn't work here)
This commit is contained in:
cpfeiffer 2015-12-07 01:26:58 +01:00
parent 134eeacaea
commit accb055307
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/AndroidManifest.xml
View File

@ -45,31 +45,23 @@
</activity> </activity>
<activity <activity
android:name=".activities.SettingsActivity" android:name=".activities.SettingsActivity"
android:label="@string/title_activity_settings"> android:label="@string/title_activity_settings"
<meta-data android:parentActivityName=".activities.ControlCenter">
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.ControlCenter" />
</activity> </activity>
<activity <activity
android:name=".devices.miband.MiBandPreferencesActivity" android:name=".devices.miband.MiBandPreferencesActivity"
android:label="@string/preferences_miband_settings"> android:label="@string/preferences_miband_settings"
<meta-data android:parentActivityName=".activities.SettingsActivity">
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.SettingsActivity" />
</activity> </activity>
<activity <activity
android:name=".activities.AppManagerActivity" android:name=".activities.AppManagerActivity"
android:label="@string/title_activity_appmanager"> android:label="@string/title_activity_appmanager"
<meta-data android:parentActivityName=".activities.ControlCenter">
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.ControlCenter" />
</activity> </activity>
<activity <activity
android:name=".activities.AppBlacklistActivity" android:name=".activities.AppBlacklistActivity"
android:label="@string/title_activity_appblacklist"> android:label="@string/title_activity_appblacklist"
<meta-data android:parentActivityName=".activities.SettingsActivity">
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.SettingsActivity" />
</activity> </activity>
<activity <activity
android:name=".activities.FwAppInstallerActivity" android:name=".activities.FwAppInstallerActivity"
@ -229,17 +221,13 @@
<activity <activity
android:name=".activities.DebugActivity" android:name=".activities.DebugActivity"
android:label="@string/title_activity_debug"> android:label="@string/title_activity_debug"
<meta-data android:parentActivityName=".activities.ControlCenter">
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.ControlCenter" />
</activity> </activity>
<activity <activity
android:name=".activities.DiscoveryActivity" android:name=".activities.DiscoveryActivity"
android:label="@string/title_activity_discovery"> android:label="@string/title_activity_discovery"
<meta-data android:parentActivityName=".activities.ControlCenter">
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.ControlCenter" />
</activity> </activity>
<activity <activity
android:name=".activities.AndroidPairingActivity" android:name=".activities.AndroidPairingActivity"
@ -251,25 +239,16 @@
android:name=".activities.charts.ChartsActivity" android:name=".activities.charts.ChartsActivity"
android:label="@string/title_activity_charts" android:label="@string/title_activity_charts"
android:parentActivityName=".activities.ControlCenter"> android:parentActivityName=".activities.ControlCenter">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.ControlCenter" />
</activity> </activity>
<activity <activity
android:name=".activities.ConfigureAlarms" android:name=".activities.ConfigureAlarms"
android:label="@string/title_activity_set_alarm" android:label="@string/title_activity_set_alarm"
android:parentActivityName=".activities.SettingsActivity"> android:parentActivityName=".activities.SettingsActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.SettingsActivity" />
</activity> </activity>
<activity <activity
android:name=".activities.AlarmDetails" android:name=".activities.AlarmDetails"
android:label="@string/title_activity_alarm_details" android:label="@string/title_activity_alarm_details"
android:parentActivityName=".activities.ConfigureAlarms"> android:parentActivityName=".activities.ConfigureAlarms">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="nodomain.freeyourgadget.gadgetbridge.activities.ConfigureAlarms" />
</activity> </activity>
</application> </application>