Skip to content

Commit

Permalink
Prepare for Android 12.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bojan committed May 21, 2021
1 parent 98a9f73 commit 305937e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# suppress inspection "UnusedProperty" for whole file
build.debug=false
build.debug=true
1 change: 1 addition & 0 deletions dbinspector-no-op/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

<activity
android:name="com.infinum.dbinspector.ui.databases.DatabasesActivity"
android:exported="false"
android:taskAffinity="com.infinum.dbinspector"
android:theme="@android:style/Theme.NoDisplay" />

Expand Down
9 changes: 9 additions & 0 deletions dbinspector/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,46 +23,55 @@

<activity
android:name="com.infinum.dbinspector.ui.databases.DatabasesActivity"
android:exported="false"
android:taskAffinity="com.infinum.dbinspector"
android:theme="@style/DbInspector.BaseTheme" />

<activity
android:name="com.infinum.dbinspector.ui.settings.SettingsActivity"
android:exported="false"
android:taskAffinity="com.infinum.dbinspector"
android:theme="@style/DbInspector.BaseTheme" />

<activity
android:name="com.infinum.dbinspector.ui.databases.edit.EditDatabaseActivity"
android:exported="false"
android:taskAffinity="com.infinum.dbinspector"
android:theme="@style/DbInspector.BaseTheme" />

<activity
android:name="com.infinum.dbinspector.ui.schema.SchemaActivity"
android:exported="false"
android:taskAffinity="com.infinum.dbinspector"
android:theme="@style/DbInspector.BaseTheme" />

<activity
android:name="com.infinum.dbinspector.ui.content.table.TableActivity"
android:exported="false"
android:taskAffinity="com.infinum.dbinspector"
android:theme="@style/DbInspector.BaseTheme" />

<activity
android:name="com.infinum.dbinspector.ui.content.view.ViewActivity"
android:exported="false"
android:taskAffinity="com.infinum.dbinspector"
android:theme="@style/DbInspector.BaseTheme" />

<activity
android:name="com.infinum.dbinspector.ui.content.trigger.TriggerActivity"
android:exported="false"
android:taskAffinity="com.infinum.dbinspector"
android:theme="@style/DbInspector.BaseTheme" />

<activity
android:name="com.infinum.dbinspector.ui.pragma.PragmaActivity"
android:exported="false"
android:taskAffinity="com.infinum.dbinspector"
android:theme="@style/DbInspector.BaseTheme" />

<activity
android:name="com.infinum.dbinspector.ui.edit.EditActivity"
android:exported="false"
android:taskAffinity="com.infinum.dbinspector"
android:theme="@style/DbInspector.BaseTheme" />

Expand Down
19 changes: 10 additions & 9 deletions sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,20 @@
android:theme="@style/AppTheme"
tools:ignore="AllowBackup,RtlEnabled">

<!-- &lt;!&ndash;suppress AndroidDomInspection &ndash;&gt;-->
<!-- <activity-alias-->
<!-- android:name="com.infinum.dbinspector.DbInspectorActivity"-->
<!-- tools:node="remove" />-->
<!-- &lt;!&ndash;suppress AndroidDomInspection &ndash;&gt;-->
<!-- <activity-alias-->
<!-- android:name="com.infinum.dbinspector.DbInspectorActivity"-->
<!-- tools:node="remove" />-->

<!-- &lt;!&ndash;suppress AndroidDomInspection &ndash;&gt;-->
<!-- <activity-alias-->
<!-- android:name="com.infinum.dbinspector.DbInspectorActivity"-->
<!-- tools:replace="android:label"-->
<!-- android:label="@string/app_name" />-->
<!-- &lt;!&ndash;suppress AndroidDomInspection &ndash;&gt;-->
<!-- <activity-alias-->
<!-- android:name="com.infinum.dbinspector.DbInspectorActivity"-->
<!-- tools:replace="android:label"-->
<!-- android:label="@string/app_name" />-->

<activity
android:name="com.infinum.dbinspector.sample.MainActivity"
android:exported="true"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down

0 comments on commit 305937e

Please sign in to comment.