Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-issues1526' into dev

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/download/DownloadManager.java
#	app/src/main/java/com/halo/assistant/fragment/WebFragment.java
#	dependencies.gradle
This commit is contained in:
juntao
2021-10-26 16:28:25 +08:00
parent 1f43b8b220 a1ecb784e2
commit f46b303a67
29 changed files with 398 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/gh/base/BaseActivity.java
View File

@ -139,6 +139,8 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
Utils.log("ACTIVITY_ENTRANCE -> " + mEntrance);
}
disableAutofill();
if (savedInstanceState != null) {
String xapkUnzipActivity = SPUtils.getString(Constants.SP_XAPK_UNZIP_ACTIVITY);
String xapkUrl = SPUtils.getString(Constants.SP_XAPK_URL);
@ -208,6 +210,15 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
}
}
/**
* 关闭 editText 自动填充帐号 （我们也用不上），开启的时候有小概率出发 TimeoutException
*/
private void disableAutofill() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
getWindow().getDecorView().setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS);
}
}
private View getRootViewWithEnvIndicator(View view) {
RelativeLayout screenRootView = new RelativeLayout(this);
screenRootView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));