mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

revert unwanted manifest changes

pull/460/head
andrekir 2022-08-16 18:52:26 -03:00
rodzic d2bed1344a
commit 46dfa80344
1 zmienionych plików z 14 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

35
app/src/main/AndroidManifest.xml
Wyświetl plik

@ -12,18 +12,18 @@
android:name="android.hardware.location.gps" android:name="android.hardware.location.gps"
android:required="false" /> android:required="false" />
<!-- TODO - wait for targetSdkVersion 31 <!-- TODO - wait for targetSdkVersion 31
&lt;!&ndash; Request legacy Bluetooth permissions on older devices &ndash;&gt; &lt;!&ndash; Request legacy Bluetooth permissions on older devices &ndash;&gt;
<uses-permission android:name="android.permission.BLUETOOTH" <uses-permission android:name="android.permission.BLUETOOTH"
android:maxSdkVersion="30" /> android:maxSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
android:maxSdkVersion="30" /> android:maxSdkVersion="30" />
&lt;!&ndash; API 31+ Bluetooth permissions &ndash;&gt; &lt;!&ndash; API 31+ Bluetooth permissions &ndash;&gt;
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" /> <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
android:usesPermissionFlags="neverForLocation" /> android:usesPermissionFlags="neverForLocation" />
--> -->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@ -78,7 +78,7 @@
<application <application
tools:replace="android:icon" tools:replace="android:icon"
android:name="com.geeksville.mesh.MeshUtilApplication" android:name="com.geeksville.mesh.MeshUtilApplication"
android:allowBackup="true" android:allowBackup="false"
android:icon="@mipmap/ic_launcher2" android:icon="@mipmap/ic_launcher2"
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher2_round" android:roundIcon="@mipmap/ic_launcher2_round"
@ -118,12 +118,6 @@
</intent-filter> </intent-filter>
</service> </service>
<!-- This is a private service which just does direct communication to the radio -->
<service
android:name="com.geeksville.mesh.service.RadioInterfaceService"
android:enabled="true"
android:exported="false" />
<!-- zxing for QR Code scanning: lock portrait orientation --> <!-- zxing for QR Code scanning: lock portrait orientation -->
<activity <activity
android:name="com.journeyapps.barcodescanner.CaptureActivity" android:name="com.journeyapps.barcodescanner.CaptureActivity"
@ -132,14 +126,13 @@
<activity <activity
android:name="com.geeksville.mesh.MainActivity" android:name="com.geeksville.mesh.MainActivity"
android:label="@string/app_name" android:launchMode="singleInstance"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:windowSoftInputMode="stateAlwaysHidden" android:windowSoftInputMode="stateAlwaysHidden"
android:theme="@style/Theme.App.Starting" android:theme="@style/Theme.App.Starting"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
@ -203,4 +196,4 @@
android:name=".AppIntroduction"/> android:name=".AppIntroduction"/>
</application> </application>
</manifest> </manifest>