Merge remote-tracking branch 'upstream/v3_openjdk' into pr/3603

# Conflicts:
#	app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so
#	app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so
#	app_pojavlauncher/src/main/jniLibs/x86/libgl4es_114.so
#	app_pojavlauncher/src/main/jniLibs/x86_64/libgl4es_114.so
This commit is contained in:
The Judge 2022-10-28 18:39:31 -07:00
commit aa73ad5cb9
5 changed files with 6 additions and 1 deletions

View File

@ -47,7 +47,12 @@ public class LauncherFragment extends Fragment {
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
// Show some text
//TODO (for rsc): properly fix the changelog
mNewsWebview = (WebView) getView().findViewById(R.id.lmaintabnewsNewsView);
mNewsWebview.loadData("News temporarily unavailable", "text/plain", "UTF-8");
/*mNewsWebview = (WebView) getView().findViewById(R.id.lmaintabnewsNewsView);
mNewsWebview.setWebViewClient(new WebViewClient(){
// API < 23
@ -100,7 +105,7 @@ public class LauncherFragment extends Fragment {
mNewsWebview.getSettings().setJavaScriptEnabled(true);
mValidUrlSelectorThread = new Thread(this::selectValidUrl);
mValidUrlSelectorThread.start();
if(!mInterruptLoad) mNewsWebview.loadUrl(Tools.URL_HOME + mValidChangelog);
if(!mInterruptLoad) mNewsWebview.loadUrl(Tools.URL_HOME + mValidChangelog);*/
}
private void selectValidUrl() {