Cleanup manifest

This commit is contained in:
topjohnwu 2019-11-08 02:15:30 -05:00
parent d952cc2327
commit 61de63a518
4 changed files with 16 additions and 30 deletions

View File

@ -13,14 +13,12 @@
android:name="a.e" android:name="a.e"
android:appComponentFactory="a.a" android:appComponentFactory="a.a"
android:allowBackup="true" android:allowBackup="true"
android:usesCleartextTraffic="true"
tools:ignore="UnusedAttribute,GoogleAppIndexingWarning" tools:ignore="UnusedAttribute,GoogleAppIndexingWarning"
tools:replace="android:appComponentFactory"> tools:replace="android:appComponentFactory">
<!-- Splash --> <!-- Splash -->
<activity <activity
android:name="a.c" android:name="a.c"
android:configChanges="orientation|screenSize"
android:theme="@style/SplashTheme"> android:theme="@style/SplashTheme">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -29,16 +27,10 @@
</activity> </activity>
<!-- Main --> <!-- Main -->
<activity <activity android:name="a.b" />
android:name="a.b"
android:configChanges="orientation|screenSize"
android:exported="true" />
<!-- Flashing --> <!-- Flashing -->
<activity <activity android:name="a.f" />
android:name="a.f"
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="nosensor" />
<!-- Superuser --> <!-- Superuser -->
<activity <activity
@ -46,6 +38,7 @@
android:directBootAware="true" android:directBootAware="true"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="false" android:exported="false"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
tools:ignore="AppLinkUrlError"> tools:ignore="AppLinkUrlError">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
@ -70,9 +63,7 @@
</receiver> </receiver>
<!-- DownloadService --> <!-- DownloadService -->
<service <service android:name="a.j" />
android:name="a.j"
android:exported="false" />
<!-- Hardcode GMS version --> <!-- Hardcode GMS version -->
<meta-data <meta-data

View File

@ -2,9 +2,9 @@ package com.topjohnwu.magisk.ui.flash
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.ActivityInfo
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import androidx.core.app.NotificationManagerCompat
import androidx.core.net.toUri import androidx.core.net.toUri
import com.topjohnwu.magisk.Const import com.topjohnwu.magisk.Const
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
@ -16,6 +16,7 @@ import com.topjohnwu.magisk.model.events.BackPressEvent
import com.topjohnwu.magisk.model.events.PermissionEvent import com.topjohnwu.magisk.model.events.PermissionEvent
import com.topjohnwu.magisk.model.events.SnackbarEvent import com.topjohnwu.magisk.model.events.SnackbarEvent
import com.topjohnwu.magisk.model.events.ViewEvent import com.topjohnwu.magisk.model.events.ViewEvent
import com.topjohnwu.magisk.view.Notifications
import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf import org.koin.core.parameter.parametersOf
import java.io.File import java.io.File
@ -32,10 +33,11 @@ open class FlashActivity : BaseActivity<FlashViewModel, ActivityFlashBinding>()
} }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
val id = intent.getIntExtra(Const.Key.DISMISS_ID, -1) val id = intent.getIntExtra(Const.Key.DISMISS_ID, -1)
if (id != -1) if (id != -1)
NotificationManagerCompat.from(this).cancel(id) Notifications.mgr.cancel(id)
} }
override fun onBackPressed() { override fun onBackPressed() {

View File

@ -1,4 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.topjohnwu.shared"> package="com.topjohnwu.shared">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@ -7,10 +8,11 @@
<application <application
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:installLocation="internalOnly"
android:label="Magisk Manager" android:label="Magisk Manager"
android:installLocation="internalOnly"
android:usesCleartextTraffic="true"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar"> tools:ignore="UnusedAttribute">
<activity <activity
android:name="a.r" android:name="a.r"

View File

@ -13,14 +13,12 @@
android:name="a.e" android:name="a.e"
android:appComponentFactory="a.a" android:appComponentFactory="a.a"
android:allowBackup="true" android:allowBackup="true"
android:usesCleartextTraffic="true"
tools:ignore="UnusedAttribute,GoogleAppIndexingWarning" > tools:ignore="UnusedAttribute,GoogleAppIndexingWarning" >
<!-- Download Activity --> <!-- Download Activity -->
<activity <activity
android:name="a.c" android:name="a.c"
android:configChanges="orientation|screenSize"
android:theme="@style/SplashTheme"> android:theme="@style/SplashTheme">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -30,21 +28,16 @@
<!-- Magisk Manager Components --> <!-- Magisk Manager Components -->
<activity <activity android:name="a.b" />
android:name="a.b"
android:configChanges="orientation|screenSize"
android:exported="true" />
<activity <activity android:name="a.f" />
android:name="a.f"
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="nosensor" />
<activity <activity
android:name="a.m" android:name="a.m"
android:directBootAware="true" android:directBootAware="true"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="false" android:exported="false"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
tools:ignore="AppLinkUrlError"> tools:ignore="AppLinkUrlError">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
@ -67,9 +60,7 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<service <service android:name="a.j" />
android:name="a.j"
android:exported="false" />
<meta-data <meta-data
android:name="com.google.android.gms.version" android:name="com.google.android.gms.version"