Commit 7e9b3f1a authored by topjohnwu's avatar topjohnwu

Merge components

parent 465aaeff
......@@ -20,6 +20,10 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<!-- Main -->
......@@ -30,15 +34,6 @@
android:windowSoftInputMode="adjustResize"
android:exported="true" />
<activity-alias
android:name="a.s"
android:targetActivity="a.c">
<intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity-alias>
<!-- Flashing -->
<activity android:name="a.f" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment