Merge branch '8_3_X' into TIMOB-27104-8_3_X

tidev · Aug 20, 2019 · 6a4d0f8 · 6a4d0f8
2 parents 2c8f970 + 19403ec
commit 6a4d0f8
Show file tree

Hide file tree

Showing 45 changed files with 393 additions and 546 deletions.
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
diff --git a/android/.idea/workspace.xml b/android/.idea/workspace.xml
diff --git a/android/cli/lib/AndroidManifest.js b/android/cli/lib/AndroidManifest.js
@@ -513,12 +513,39 @@ function AndroidManifest(filename) {
 					case 'uses-feature':
 						this[tag] || (this[tag] = []);
 						src[tag].forEach(function (tagItem) {
-							// Check for already added features.
-							let duplicateItem = this[tag].find(function (nextItem) {
+							// If given "uses-feature" name has already been added, then fetch its object.
+							const duplicateItem = this[tag].find(function (nextItem) {
 								// Compare them directly or by name.
 								return (nextItem === tagItem) || (nextItem.name === tagItem.name);
 							});
-							if (!duplicateItem) {
+							if (duplicateItem === tagItem) {
+								// Given reference was already added. Do nothing.
+							} else if (duplicateItem) {
+								// This is a duplicate "uses-feature" element name. Merge its settings.
+								if (typeof tagItem['tools:replace'] === 'string') {
+									// This attribute provides an array of other attributes that must be replaced.
+									tagItem['tools:replace'].split(',').forEach(function (attributeName) {
+										attributeName = attributeName.replace(androidAttrPrefixRegExp, '');
+										if (attributeName !== 'name') {
+											const value = tagItem[attributeName];
+											if (typeof value === 'undefined') {
+												delete duplicateItem[attributeName];
+											} else {
+												duplicateItem[attributeName] = value;
+											}
+										}
+									});
+								} else if (duplicateItem.required === false) {
+									// Do a logical OR on the "required" attribute value.
+									// If the "required" attribute is not defined, then it is considered true.
+									if (typeof tagItem.required === 'undefined') {
+										delete duplicateItem.required;
+									} else if (tagItem.required) {
+										duplicateItem.required = tagItem.required;
+									}
+								}
+							} else {
+								// The given "uses-feature" name has not been added yet. Do so now.
 								this[tag].push(tagItem);
 							}
 						}, this);

diff --git a/android/dev/TitaniumTest/AndroidManifest.xml b/android/dev/TitaniumTest/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.titanium.test" android:versionCode="1" android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28"/>
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29"/>
 	<application android:icon="@drawable/appicon" android:label="TitaniumTest" android:name=".TitaniumTestApplication" android:theme="@style/Theme.AppCompat">
 		<activity android:name=".TitaniumTestActivity" android:label="@string/app_name" android:theme="@style/Theme.Titanium" android:configChanges="keyboardHidden|orientation|screenSize">
 			<intent-filter>

diff --git a/android/dev/TitaniumTest/project.properties b/android/dev/TitaniumTest/project.properties
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../titanium
 android.library.reference.2=../../modules/accelerometer
 android.library.reference.3=../../modules/analytics

diff --git a/android/modules/accelerometer/project.properties b/android/modules/accelerometer/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/analytics/project.properties b/android/modules/analytics/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/android/AndroidManifest.xml b/android/modules/android/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	android:versionCode="1"
 	android:versionName="1.0">
 
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
 
 	<application android:label="@string/app_name">
 	</application>

diff --git a/android/modules/android/project.properties b/android/modules/android/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../filesystem

diff --git a/android/modules/app/project.properties b/android/modules/app/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/appcompat/project.properties b/android/modules/appcompat/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-28
+target=android-29
 android.library=true
diff --git a/android/modules/calendar/project.properties b/android/modules/calendar/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/cardview/project.properties b/android/modules/cardview/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-28
+target=android-29
 android.library=true
diff --git a/android/modules/compat/project.properties b/android/modules/compat/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-28
+target=android-29
 android.library=true
diff --git a/android/modules/contacts/project.properties b/android/modules/contacts/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/database/project.properties b/android/modules/database/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/design/project.properties b/android/modules/design/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-28
+target=android-29
 android.library=true
diff --git a/android/modules/filesystem/project.properties b/android/modules/filesystem/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/geolocation/project.properties b/android/modules/geolocation/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/gesture/project.properties b/android/modules/gesture/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/locale/project.properties b/android/modules/locale/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/media/project.properties b/android/modules/media/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.3=../filesystem
 android.library.reference.2=../../titanium

diff --git a/android/modules/network/project.properties b/android/modules/network/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.3=../xml
 android.library.reference.2=../../titanium

diff --git a/android/modules/platform/project.properties b/android/modules/platform/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../../kroll-apt
diff --git a/android/modules/ui/AndroidManifest.xml b/android/modules/ui/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	android:versionCode="1"
 	android:versionName="1.0">
 
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
 
 	<application android:label="@string/app_name">
 	</application>

diff --git a/android/modules/ui/project.properties b/android/modules/ui/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=android-28
+target=android-29
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
 android.library.reference.3=../filesystem

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java
@@ -21,6 +21,7 @@
 import org.appcelerator.titanium.TiBaseActivity;
 import org.appcelerator.titanium.TiBlob;
 import org.appcelerator.titanium.TiC;
+import org.appcelerator.titanium.TiRootActivity;
 import org.appcelerator.titanium.proxy.TiWindowProxy;
 import org.appcelerator.titanium.util.TiConvert;
 import org.appcelerator.titanium.util.TiUIHelper;
@@ -388,6 +389,11 @@ protected void handleOpen(KrollDict options)
 			topActivity.overridePendingTransition(enterAnimation, exitAnimation);
 		} else {
 			topActivity.startActivity(intent);
+			if (topActivity instanceof TiRootActivity) {
+				// A fade-in transition from root splash screen to first window looks better than a slide-up.
+				// Also works-around issue where splash in mid-transition might do a 2nd transition on cold start.
+				topActivity.overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+			}
 		}
 	}
 

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java
@@ -20,6 +20,7 @@
 import org.appcelerator.titanium.TiBaseActivity;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.TiDimension;
+import org.appcelerator.titanium.TiRootActivity;
 import org.appcelerator.titanium.TiTranslucentActivity;
 import org.appcelerator.titanium.proxy.ActivityProxy;
 import org.appcelerator.titanium.proxy.TiWindowProxy;
@@ -56,6 +57,7 @@
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
+
 // clang-format off
 @Kroll.proxy(creatableInModule = UIModule.class,
 	propertyAccessors = {
@@ -168,6 +170,11 @@ protected void handleOpen(KrollDict options)
 			topActivity.startActivity(intent, createActivityOptionsBundle(topActivity));
 		} else {
 			topActivity.startActivity(intent);
+			if (topActivity instanceof TiRootActivity) {
+				// A fade-in transition from root splash screen to first window looks better than a slide-up.
+				// Also works-around issue where splash in mid-transition might do a 2nd transition on cold start.
+				topActivity.overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+			}
 		}
 
 		if (options.containsKey(TiC.PROPERTY_SUSTAINED_PERFORMANCE_MODE)) {

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIDialog.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIDialog.java
@@ -47,7 +47,7 @@ public ClickHandler(int id)
 		}
 		public void onClick(DialogInterface dialog, int which)
 		{
-			handleEvent(result);
+			handleEvent(result, true);
 			hide(null);
 		}
 	}
@@ -134,7 +134,7 @@ private void processOptions(String[] optionText, int selectedIndex)
 				@Override
 				public void onClick(DialogInterface dialog, int which)
 				{
-					handleEvent(which);
+					handleEvent(which, true);
 					hide(null);
 				}
 			});
@@ -143,7 +143,7 @@ public void onClick(DialogInterface dialog, int which)
 				@Override
 				public void onClick(DialogInterface dialog, int which)
 				{
-					handleEvent(which);
+					handleEvent(which, false);
 					hide(null);
 				}
 			});
@@ -322,7 +322,8 @@ public void onCancel(DialogInterface dlg)
 										  ? TiConvert.toInt(proxy.getProperty(TiC.PROPERTY_CANCEL))
 										  : -1;
 					Log.d(TAG, "onCancelListener called. Sending index: " + cancelIndex, Log.DEBUG_MODE);
-					handleEvent(cancelIndex);
+					// In case wew cancel the Dialog we should not overwrite the selectedIndex
+					handleEvent(cancelIndex, false);
 					hide(null);
 				}
 			});
@@ -347,7 +348,7 @@ public void onCancel(DialogInterface dlg)
 			}
 
 			dialogWrapper.setDialog(dialog);
-			builder = null;
+			this.builder = null;
 		}
 
 		try {
@@ -438,7 +439,7 @@ private void createBuilder()
 		}
 	}
 
-	public void handleEvent(int id)
+	public void handleEvent(int id, boolean saveSelectedIndex)
 	{
 		int cancelIndex =
 			(proxy.hasProperty(TiC.PROPERTY_CANCEL)) ? TiConvert.toInt(proxy.getProperty(TiC.PROPERTY_CANCEL)) : -1;
@@ -452,8 +453,8 @@ public void handleEvent(int id)
 				id &= ~BUTTON_MASK;
 			} else {
 				data.put(TiC.PROPERTY_BUTTON, false);
-				// If an option was selected and the user accepted it, update the proxy.
-				if (proxy.hasProperty(TiC.PROPERTY_OPTIONS)) {
+				// If an option was selected, the user accepted and we are showing radio buttons, update the proxy.
+				if (proxy.hasProperty(TiC.PROPERTY_OPTIONS) && saveSelectedIndex) {
 					proxy.setProperty(TiC.PROPERTY_SELECTED_INDEX, id);
 				}
 			}