mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-14 15:17:02 -04:00
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:
commit
aa73ad5cb9
@ -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() {
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user