Skip to content

Commit

Permalink
lifting the activity alias entry to the application module
Browse files Browse the repository at this point in the history
- fixes the androidTests expecting a shortcuts xml
  • Loading branch information
ouchadam committed Sep 15, 2022
1 parent 619ea81 commit e9d15b4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 17 deletions.
18 changes: 18 additions & 0 deletions vector-app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@
tools:ignore="UnusedAttribute"
tools:replace="android:allowBackup">

<!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->
<!-- exported="true" is required to launch application -->
<activity-alias
android:name=".features.Alias"
android:exported="true"
android:targetActivity="im.vector.app.features.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

<meta-data
android:name="android.app.shortcuts"
android:resource="@xml/shortcuts" />
</activity-alias>


<!-- Providers -->

<!-- Remove WorkManagerInitializer Provider because we are using on-demand initialization of WorkManager-->
Expand Down
17 changes: 0 additions & 17 deletions vector/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,6 @@
android:name=".features.MainActivity"
android:theme="@style/Theme.Vector.Launcher" />

<!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->
<!-- exported="true" is required to launch application -->
<activity-alias
android:name=".features.Alias"
android:exported="true"
android:targetActivity=".features.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

<meta-data
android:name="android.app.shortcuts"
android:resource="@xml/shortcuts" />
</activity-alias>

<activity android:name=".features.home.HomeActivity" />

<activity
Expand Down

0 comments on commit e9d15b4

Please sign in to comment.