diff options
| author | Docile-Alligator <chineseperson5@gmail.com> | 2020-06-16 07:19:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 07:19:43 +0000 |
| commit | fea972727c60f623bd8062868e94fc866e1096b0 (patch) | |
| tree | 7d90ca137b8cb9afd64bd258df0287696aaf812d /app/src/main/AndroidManifest.xml | |
| parent | 268ea4f9d882b4475d808a8452137f3629738dcb (diff) | |
| parent | 88a21195860bb99ab3cbc4b992b1d57bc016fcb4 (diff) | |
| download | infinity-for-reddit-fea972727c60f623bd8062868e94fc866e1096b0.tar infinity-for-reddit-fea972727c60f623bd8062868e94fc866e1096b0.tar.gz infinity-for-reddit-fea972727c60f623bd8062868e94fc866e1096b0.tar.bz2 infinity-for-reddit-fea972727c60f623bd8062868e94fc866e1096b0.tar.lz infinity-for-reddit-fea972727c60f623bd8062868e94fc866e1096b0.tar.xz infinity-for-reddit-fea972727c60f623bd8062868e94fc866e1096b0.tar.zst infinity-for-reddit-fea972727c60f623bd8062868e94fc866e1096b0.zip | |
Merge pull request #126 from Docile-Alligator/OHermesJunior-refactor-view-image
Resolve conflicts: Some refactors on media activities.
Diffstat (limited to '')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 974c81b6..f26d5ef7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -84,10 +84,6 @@ android:parentActivityName=".Activity.MainActivity" android:theme="@style/AppTheme.NoActionBar" /> <activity - android:name=".Activity.ViewGIFActivity" - android:parentActivityName=".Activity.MainActivity" - android:theme="@style/AppTheme.Draggable" /> - <activity android:name=".Activity.AccountSavedThingActivity" android:label="@string/account_saved_thing_activity_label" android:parentActivityName=".Activity.MainActivity" @@ -290,7 +286,7 @@ android:parentActivityName=".Activity.MainActivity" android:theme="@style/AppTheme.NoActionBar" /> <activity - android:name=".Activity.ViewImageActivity" + android:name=".Activity.ViewImageOrGifActivity" android:parentActivityName=".Activity.MainActivity" android:theme="@style/AppTheme.Draggable" /> <activity |