Merge branch '8_0_X' into TIMOB-26889-8_0_X

tidev · Mar 25, 2019 · 8075f2a · 8075f2a
2 parents 5babc56 + e8ab746
commit 8075f2a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiLaunchActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiLaunchActivity.java
@@ -131,7 +131,7 @@ protected void onCreate(Bundle savedInstanceState)
 				}
 				startActivity(resumeIntent);
 				finish();
-				overridePendingTransition(0, 0);
+				overridePendingTransition(android.R.anim.fade_in, 0);
 			} else {
 				// Launch a new root activity instance with JSActivity's intent embedded within launch intent.
 				Intent mainIntent = getPackageManager().getLaunchIntentForPackage(getPackageName());
@@ -146,7 +146,7 @@ protected void onCreate(Bundle savedInstanceState)
 					mainIntent.putExtra(TiC.EXTRA_TI_NEW_INTENT, getIntent());
 				}
 				finish();
-				overridePendingTransition(0, 0);
+				overridePendingTransition(android.R.anim.fade_in, 0);
 				startActivity(mainIntent);
 			}
 			return;

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiRootActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiRootActivity.java
@@ -201,9 +201,9 @@ public void run()
 			// Destroy this activity before it is shown.
 			finish();
 
-			// Disable this activity's enter/exit animation. (Looks bad if we keep it.)
+			// Disable activity's exit animation. (Looks bad if we keep it on a Pixel XL.)
 			// Note: Must be done after calling finish() above.
-			overridePendingTransition(0, 0);
+			overridePendingTransition(android.R.anim.fade_in, 0);
 			return;
 		}
 
@@ -218,7 +218,7 @@ public void run()
 				this.isDuplicateInstance = true;
 				activityOnCreate(savedInstanceState);
 				finish();
-				overridePendingTransition(0, 0);
+				overridePendingTransition(android.R.anim.fade_in, 0);
 				final Intent relaunchIntent = isNotMainIntent ? mainIntent : newIntent;
 				if (isNotMainIntent && (newIntent != null)) {
 					// Embed this destroyed activity's intent within the new launch intent.

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiBlob.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiBlob.m
@@ -382,7 +382,7 @@ - (id)imageAsCompressed:(id)args
     ENSURE_ARG_COUNT(args, 1);
 
     float compressionQuality = [TiUtils floatValue:[args objectAtIndex:0] def:1.0];
-    return [[[TiBlob alloc] initWithData:UIImageJPEGRepresentation(image, compressionQuality) mimetype:@"image/jpeg"] autorelease];
+    return [[[TiBlob alloc] _initWithPageContext:[self pageContext] andData:UIImageJPEGRepresentation(image, compressionQuality) mimetype:@"image/jpeg"] autorelease];
   }
   return nil;
 }