Skip to content

Commit

Permalink
Rotationsfehler behoben
Browse files Browse the repository at this point in the history
  • Loading branch information
Darius Musiolik authored and Darius Musiolik committed Sep 6, 2016
1 parent 205c238 commit 492b882
Show file tree
Hide file tree
Showing 33 changed files with 114 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "dmusiolik.ajcbk_vp.test";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "2.0";
public static final int VERSION_CODE = 2;
public static final String VERSION_NAME = "2.1";
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="dmusiolik.ajcbk_vp"
android:versionCode="1"
android:versionName="2.0" >
android:versionCode="2"
android:versionName="2.1" >

<uses-sdk
android:minSdkVersion="15"
Expand All @@ -19,7 +19,9 @@
android:theme="@style/AppTheme" >
<activity
android:name="dmusiolik.ajcbk_vp.LoginActivity"
android:label="@string/app_name" >
android:configChanges="orientation"
android:label="@string/app_name"
android:screenOrientation="portrait" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -28,7 +30,10 @@
</activity>
<activity
android:name="dmusiolik.ajcbk_vp.MainActivity"
android:label="Vertretungsplan" />
android:configChanges="orientation"
android:label="Vertretungsplan"
android:screenOrientation="portrait" >
</activity>
</application>

</manifest>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified app/build/intermediates/instant-run-support/debug/classes.zip
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2221601882
4078124850
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
CHANGED,/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/transforms/instantRun/debug/folders/4000/5/enhanced/dmusiolik/ajcbk_vp/BuildConfig$override.class
CHANGED,/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/transforms/instantRun/debug/folders/4000/5/enhanced/com/android/tools/fd/runtime/AppPatchesLoaderImpl.class
CHANGED,/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/transforms/instantRun/debug/folders/4000/5/enhanced/dmusiolik/ajcbk_vp/MainActivity$1$override.class
CHANGED,/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/transforms/instantRun/debug/folders/4000/5/enhanced/dmusiolik/ajcbk_vp/MainActivity$override.class
Binary file modified app/build/intermediates/instant-run-support/debug/resources.zip
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
android:theme="@style/AppTheme" >
<activity
android:name="dmusiolik.ajcbk_vp.LoginActivity"
android:label="@string/app_name" >
android:configChanges="orientation"
android:label="@string/app_name"
android:screenOrientation="portrait" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -27,7 +29,10 @@
</activity>
<activity
android:name="dmusiolik.ajcbk_vp.MainActivity"
android:label="Vertretungsplan" />
android:configChanges="orientation"
android:label="Vertretungsplan"
android:screenOrientation="portrait" >
</activity>
</application>

</manifest>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified app/build/intermediates/res/resources-debug.ap_
Binary file not shown.
10 changes: 5 additions & 5 deletions app/build/intermediates/restart-dex/debug/build-info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
api-level="23"
density="420dpi"
format="7"
timestamp="130369145716071"
timestamp="169359417587922"
token="7772881252675121292" >

<task
name="javac"
duration="91" />
duration="0" />
<task
name="instant-run-dex"
duration="0" />
<task
name="instant-run-transform"
duration="23" />
duration="0" />
<task
name="verifier"
duration="1" />
duration="0" />

<artifact
location="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/outputs/apk/app-debug.apk"
type="MAIN" />

<build timestamp="130369145716071" >
<build timestamp="169359417587922" >
<artifact
location="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/outputs/apk/app-debug.apk"
type="MAIN" />
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
130369145716071
169186492398449
Binary file not shown.
Binary file modified app/build/outputs/apk/app-debug-unaligned.apk
Binary file not shown.
Binary file modified app/build/outputs/apk/app-debug.apk
Binary file not shown.
30 changes: 19 additions & 11 deletions app/build/outputs/logs/manifest-merger-debug-report.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Merging decision tree log ---
manifest
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:2:1-25:12
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:2:1-32:12
package
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:3:5-33
INJECTED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml
Expand All @@ -18,7 +18,7 @@ ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/Andr
android:name
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:5:22-64
application
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:7:5-23:19
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:7:5-30:19
MERGED from [com.android.support:appcompat-v7:23.2.1] /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.1/AndroidManifest.xml:25:5-20
MERGED from [com.android.support:support-v4:23.2.1] /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/AndroidManifest.xml:22:5-20
MERGED from [com.android.support:animated-vector-drawable:23.2.1] /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.1/AndroidManifest.xml:7:5-20
Expand Down Expand Up @@ -47,27 +47,35 @@ MERGED from [com.android.support:support-v4:23.2.1] /crypthome/dmusiolik/Android
android:theme
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:12:9-40
activity#dmusiolik.ajcbk_vp.LoginActivity
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:13:9-21:20
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:13:9-23:20
android:screenOrientation
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:16:13-49
android:label
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:15:13-45
android:configChanges
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:17:13-48
android:name
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:14:13-42
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:16:13-20:29
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:18:13-22:29
action#android.intent.action.MAIN
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:17:17-69
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:19:17-69
android:name
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:17:25-66
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:19:25-66
category#android.intent.category.LAUNCHER
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:19:17-77
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:21:17-77
android:name
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:19:27-74
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:21:27-74
activity#dmusiolik.ajcbk_vp.MainActivity
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:22:9-91
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:24:9-29:20
android:screenOrientation
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:27:13-49
android:label
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:22:48-79
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:26:13-44
android:configChanges
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:28:13-48
android:name
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:22:19-47
ADDED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml:25:13-41
uses-sdk
INJECTED from /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/src/main/AndroidManifest.xml reason: use-sdk injection requested
MERGED from [com.android.support:appcompat-v7:23.2.1] /crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.1/AndroidManifest.xml:21:5-23:78
Expand Down
11 changes: 9 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,21 @@
android:theme="@style/AppTheme">
<activity
android:name=".LoginActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:screenOrientation="portrait"
android:configChanges="orientation">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".MainActivity" android:label="Vertretungsplan"></activity>
<activity
android:name=".MainActivity"
android:label="Vertretungsplan"
android:screenOrientation="portrait"
android:configChanges="orientation">
</activity>
</application>

</manifest>
61 changes: 60 additions & 1 deletion build/intermediates/dex-cache/cache.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<items version="2" />
<items version="2" >

<item
jar="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.2.1/jars/classes.jar"
jumboMode="false"
revision="23.0.3"
sha1="e3885783ff8926ed9e2fdcd16816c2e1e73e7aee">
<dex dex="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/pre-dexed/debug/com.android.support-recyclerview-v7-23.2.1_42a585d4f118b045132c894de989467af98a418b.jar" />
</item>
<item
jar="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.1/jars/classes.jar"
jumboMode="false"
revision="23.0.3"
sha1="3469cb457f10f74c28cbc05f069b6c894f6cbdd0">
<dex dex="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/pre-dexed/debug/com.android.support-animated-vector-drawable-23.2.1_e545db9a792c46069b1a7b909365090e77242d13.jar" />
</item>
<item
jar="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/jars/classes.jar"
jumboMode="false"
revision="23.0.3"
sha1="3be474b1b21b31cf2fa93fe6bd641ae108d96452">
<dex dex="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/pre-dexed/debug/com.android.support-support-v4-23.2.1_7f6f07a5c99cc5b6811ddb4dbabe2b772ecffba4.jar" />
</item>
<item
jar="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.1/jars/classes.jar"
jumboMode="false"
revision="23.0.3"
sha1="e4d0cbb0b999604b349062f0214a0a228a7fd151">
<dex dex="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/pre-dexed/debug/com.android.support-appcompat-v7-23.2.1_c377c6154bfd40167ca806964d15302ee7d832d7.jar" />
</item>
<item
jar="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/jars/libs/internal_impl-23.2.1.jar"
jumboMode="false"
revision="23.0.3"
sha1="607a3d0b8013b4ccbfeb0b7cb293351994e021fb">
<dex dex="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/pre-dexed/debug/internal_impl-23.2.1_60883925efe7764673f5193108b7a0a10317d42e.jar" />
</item>
<item
jar="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.2.1/jars/classes.jar"
jumboMode="false"
revision="23.0.3"
sha1="673d77a5bbddd766037f088e775df525c46407f0">
<dex dex="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/pre-dexed/debug/com.android.support-support-vector-drawable-23.2.1_aa286285dd7a94f0aeee7d0267af82dc544c2063.jar" />
</item>
<item
jar="/home/dmusiolik/Android/Sdk/extras/android/m2repository/com/android/support/support-annotations/23.2.1/support-annotations-23.2.1.jar"
jumboMode="false"
revision="23.0.3"
sha1="ccb693bc0774fcb637246f7360de25b4af7df318">
<dex dex="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/pre-dexed/debug/support-annotations-23.2.1_0fb45e07786e4f39b8b70933b54c7ab6baab1106.jar" />
</item>
<item
jar="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/exploded-aar/com.android.support/design/23.2.1/jars/classes.jar"
jumboMode="false"
revision="23.0.3"
sha1="72961d8b453b46e277702f18de9d210bc019e36e">
<dex dex="/crypthome/dmusiolik/AndroidStudioProjects/AJCBK-VP/app/build/intermediates/pre-dexed/debug/com.android.support-design-23.2.1_8267ecb5ba5aaf3383838231338b22ca7418f2aa.jar" />
</item>

</items>
Binary file added screen1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screen2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 492b882

Please sign in to comment.