mirror of https://github.com/LeOS-GSI/LeOS-Genesis
parent
34b04117e6
commit
c616d1c7f3
|
@ -57,11 +57,11 @@ android {
|
||||||
|
|
||||||
splits {
|
splits {
|
||||||
abi {
|
abi {
|
||||||
//enable project.ext.splitEnabled
|
enable project.ext.splitEnabled
|
||||||
|
|
||||||
//reset()
|
reset()
|
||||||
|
|
||||||
//include project.ext.abi_x86, project.ext.abi_x86_x64, project.ext.abi_arm64, project.ext.abi_armeabi
|
include project.ext.abi_x86, project.ext.abi_x86_x64, project.ext.abi_arm64, project.ext.abi_armeabi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
bundle {
|
bundle {
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
"versionCode": 398,
|
"versionCode": 565,
|
||||||
"versionName": "Build | Dark-Origin 1.0.5.2",
|
"versionName": "Build | Dark-Origin 1.1.0.9",
|
||||||
"outputFile": "app-orion-x86_64-release.apk"
|
"outputFile": "app-orion-x86_64-release.apk"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -29,23 +29,10 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
"versionCode": 397,
|
"versionCode": 565,
|
||||||
"versionName": "Build | Dark-Origin 1.0.5.2",
|
"versionName": "Build | Dark-Origin 1.1.0.9",
|
||||||
"outputFile": "app-orion-x86-release.apk"
|
"outputFile": "app-orion-x86-release.apk"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "ONE_OF_MANY",
|
|
||||||
"filters": [
|
|
||||||
{
|
|
||||||
"filterType": "ABI",
|
|
||||||
"value": "armeabi-v7a"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"attributes": [],
|
|
||||||
"versionCode": 395,
|
|
||||||
"versionName": "Build | Dark-Origin 1.0.5.2",
|
|
||||||
"outputFile": "app-orion-armeabi-v7a-release.apk"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"type": "ONE_OF_MANY",
|
"type": "ONE_OF_MANY",
|
||||||
"filters": [
|
"filters": [
|
||||||
|
@ -55,9 +42,22 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
"versionCode": 396,
|
"versionCode": 565,
|
||||||
"versionName": "Build | Dark-Origin 1.0.5.2",
|
"versionName": "Build | Dark-Origin 1.1.0.9",
|
||||||
"outputFile": "app-orion-arm64-v8a-release.apk"
|
"outputFile": "app-orion-arm64-v8a-release.apk"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "ONE_OF_MANY",
|
||||||
|
"filters": [
|
||||||
|
{
|
||||||
|
"filterType": "ABI",
|
||||||
|
"value": "armeabi-v7a"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"attributes": [],
|
||||||
|
"versionCode": 565,
|
||||||
|
"versionName": "Build | Dark-Origin 1.1.0.9",
|
||||||
|
"outputFile": "app-orion-armeabi-v7a-release.apk"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"elementType": "File"
|
"elementType": "File"
|
||||||
|
|
|
@ -1557,7 +1557,7 @@ public class homeViewController {
|
||||||
public void onNewTabAnimation(List<Object> data, Object e_type, int pDelay, String pCurrentURL) {
|
public void onNewTabAnimation(List<Object> data, Object e_type, int pDelay, String pCurrentURL) {
|
||||||
|
|
||||||
if (mNewTabBlocker.getAlpha() != 0) {
|
if (mNewTabBlocker.getAlpha() != 0) {
|
||||||
return;
|
//return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(e_type!=null && e_type.equals(homeEnums.eHomeViewCallback.M_INITIALIZE_TAB_SINGLE) && !status.sOpenURLInNewTab){
|
if(e_type!=null && e_type.equals(homeEnums.eHomeViewCallback.M_INITIALIZE_TAB_SINGLE) && !status.sOpenURLInNewTab){
|
||||||
|
@ -1572,6 +1572,9 @@ public class homeViewController {
|
||||||
|
|
||||||
mNewTabBlocker.setVisibility(View.VISIBLE);
|
mNewTabBlocker.setVisibility(View.VISIBLE);
|
||||||
ObjectAnimator alpha = ObjectAnimator.ofPropertyValuesHolder(mNewTabBlocker, PropertyValuesHolder.ofFloat("alpha", 0, 1f));
|
ObjectAnimator alpha = ObjectAnimator.ofPropertyValuesHolder(mNewTabBlocker, PropertyValuesHolder.ofFloat("alpha", 0, 1f));
|
||||||
|
if (mNewTabBlocker.getAlpha() != 0) {
|
||||||
|
alpha = ObjectAnimator.ofPropertyValuesHolder(mNewTabBlocker, PropertyValuesHolder.ofFloat("alpha", 1, 1f));
|
||||||
|
}
|
||||||
|
|
||||||
alpha.setDuration(150);
|
alpha.setDuration(150);
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* Version */
|
/* Version */
|
||||||
project.ext.vname = 'Build | Dark-Origin 1.1.0.5'
|
project.ext.vname = 'Build | Dark-Origin 1.1.0.11'
|
||||||
project.ext.vcode = 545
|
project.ext.vcode = 575
|
||||||
project.ext.buildType = 'release'
|
project.ext.buildType = 'release'
|
||||||
project.ext.jvmTarget = "1.8"
|
project.ext.jvmTarget = "1.8"
|
||||||
project.ext.applovin_key = "pCPe4EeU2ZQVwQPeHLgseRqHBX1V5pvo9Piuu4J809dRhadEgukXa1A8po_UeXu5hmPOTaP1v4QPaMKIEOhh50"
|
project.ext.applovin_key = "pCPe4EeU2ZQVwQPeHLgseRqHBX1V5pvo9Piuu4J809dRhadEgukXa1A8po_UeXu5hmPOTaP1v4QPaMKIEOhh50"
|
||||||
|
|
Loading…
Reference in New Issue