Skip to content

Commit

Permalink
Activity doesn't restart on switching modes
Browse files Browse the repository at this point in the history
  • Loading branch information
@gourabsingha1 @aaronbrethorst
gourabsingha1 authored and aaronbrethorst committed Mar 15, 2024
1 parent 44a33a5 commit a18606f
Showing 1 changed file with 68 additions and 51 deletions.
119 changes: 68 additions & 51 deletions onebusaway-android/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
<activity
android:name="org.onebusaway.android.ui.SearchActivity"
android:launchMode="singleTop"
android:exported="true">
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
Expand All @@ -73,122 +74,136 @@
</activity>

<activity
android:name="org.onebusaway.android.ui.HomeActivity"
android:exported="true">
android:name="org.onebusaway.android.ui.HomeActivity"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity
android:name="org.onebusaway.android.ui.ArrivalsListActivity"
android:launchMode="singleTop"
android:exported="true">
android:name="org.onebusaway.android.ui.ArrivalsListActivity"
android:launchMode="singleTop"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
<activity
android:name="com.joulespersecond.seattlebusbot.ArrivalsListActivity"
android:launchMode="singleTop"
android:exported="true">
android:name="com.joulespersecond.seattlebusbot.ArrivalsListActivity"
android:launchMode="singleTop"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
<activity android:name="org.onebusaway.android.ui.StopInfoActivity"
android:exported="true">
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
<activity android:name="org.onebusaway.android.ui.RouteInfoActivity"
android:exported="true">
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
<activity android:name="com.joulespersecond.seattlebusbot.RouteInfoActivity"
android:exported="true">
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>
<activity android:name="org.onebusaway.android.ui.TripInfoActivity"/>
<activity android:name=".ui.MyRemindersActivity"/>
<activity android:name="org.onebusaway.android.ui.TripDetailsActivity"
android:exported="true">
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
</intent-filter>
</activity>

<activity
android:name="org.onebusaway.android.ui.MyStopsActivity"
android:label="@string/stop_shortcut"
android:exported="true">
android:name="org.onebusaway.android.ui.MyStopsActivity"
android:label="@string/stop_shortcut"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>

<activity
android:name="com.joulespersecond.seattlebusbot.MyStopsActivity"
android:label="@string/stop_shortcut"
android:exported="true">
android:name="com.joulespersecond.seattlebusbot.MyStopsActivity"
android:label="@string/stop_shortcut"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>
</intent-filter>
</activity>
<activity
android:name="org.onebusaway.android.ui.MyRecentStopsActivity"
android:label="@string/recent_stops_shortcut"
android:exported="true">
android:name="org.onebusaway.android.ui.MyRecentStopsActivity"
android:label="@string/recent_stops_shortcut"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name="org.onebusaway.android.ui.MyStarredStopsActivity"
android:label="@string/starred_stops_shortcut"
android:exported="true">
android:name="org.onebusaway.android.ui.MyStarredStopsActivity"
android:label="@string/starred_stops_shortcut"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name="org.onebusaway.android.ui.MyRoutesActivity"
android:label="@string/route_shortcut"
android:exported="true">
android:name="org.onebusaway.android.ui.MyRoutesActivity"
android:label="@string/route_shortcut"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name="com.joulespersecond.seattlebusbot.MyRoutesActivity"
android:label="@string/route_shortcut"
android:exported="true">
android:name="com.joulespersecond.seattlebusbot.MyRoutesActivity"
android:label="@string/route_shortcut"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>
</intent-filter>
</activity>
<activity
android:name="org.onebusaway.android.ui.MyRecentRoutesActivity"
android:label="@string/recent_routes_shortcut"
android:exported="true">
android:name="org.onebusaway.android.ui.MyRecentRoutesActivity"
android:label="@string/recent_routes_shortcut"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<!-- ActionBarCompat library doesn't have an ActionBarPreferenceActivity, so define parent here-->
<activity
android:name="org.onebusaway.android.ui.PreferencesActivity"
android:parentActivityName="org.onebusaway.android.ui.HomeActivity">
android:name="org.onebusaway.android.ui.PreferencesActivity"
android:parentActivityName="org.onebusaway.android.ui.HomeActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.onebusaway.android.ui.HomeActivity"/>
Expand All @@ -200,10 +215,11 @@
<activity android:name="org.onebusaway.android.report.ui.InfrastructureIssueActivity"/>

<activity
android:name="org.onebusaway.android.ui.MyRecentStopsAndRoutesActivity"
android:label="@string/my_recent_title"
android:parentActivityName="org.onebusaway.android.ui.HomeActivity"
android:exported="true">
android:name="org.onebusaway.android.ui.MyRecentStopsAndRoutesActivity"
android:label="@string/my_recent_title"
android:parentActivityName="org.onebusaway.android.ui.HomeActivity"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>
<category android:name="android.intent.category.DEFAULT"/>
Expand All @@ -214,11 +230,12 @@
android:value="org.onebusaway.android.ui.HomeActivity"/>
</activity>
<activity
android:name="org.onebusaway.android.ui.NightLightActivity"
android:label="@string/stop_info_option_night_light"
android:parentActivityName="org.onebusaway.android.ui.HomeActivity"
android:screenOrientation="portrait"
android:exported="true">
android:name="org.onebusaway.android.ui.NightLightActivity"
android:label="@string/stop_info_option_night_light"
android:parentActivityName="org.onebusaway.android.ui.HomeActivity"
android:screenOrientation="portrait"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT"/>
<category android:name="android.intent.category.DEFAULT"/>
Expand All @@ -229,9 +246,9 @@
android:value="org.onebusaway.android.ui.HomeActivity"/>
</activity>
<activity
android:name="org.onebusaway.android.ui.TripPlanActivity"
android:label="@string/title_activity_trip_plan"
android:parentActivityName="org.onebusaway.android.ui.HomeActivity">
android:name="org.onebusaway.android.ui.TripPlanActivity"
android:label="@string/title_activity_trip_plan"
android:parentActivityName="org.onebusaway.android.ui.HomeActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.onebusaway.android.ui.HomeActivity"/>
Expand All @@ -253,8 +270,8 @@
android:authorities="${databaseAuthority}"/>

<service
android:name=".tripservice.TripService"
android:permission="${applicationId}.permission.TRIP_SERVICE"
android:name=".tripservice.TripService"
android:permission="${applicationId}.permission.TRIP_SERVICE"
android:exported="true">
<intent-filter>
<action android:name="${applicationId}.AlarmReceiver"/>
Expand All @@ -263,7 +280,7 @@
</service>

<service
android:name=".directions.realtime.RealtimeService">
android:name=".directions.realtime.RealtimeService">
</service>

<service
Expand Down

0 comments on commit a18606f

Please sign in to comment.