Merge branch 'v3_openjdk' of https://github.com/PojavLauncherTeam/PojavLauncher into v3_openjdk

This commit is contained in:
khanhduytran0 2020-09-06 07:55:23 +07:00
commit 9a1a2d4aff

View File

@ -73,22 +73,23 @@ public class MCLauncherActivity extends AppCompatActivity
AndroidDisplay.windowHeight = dm.heightPixels; AndroidDisplay.windowHeight = dm.heightPixels;
viewInit(); viewInit();
final View decorView = getWindow().getDecorView(); final View decorView = getWindow().getDecorView();
decorView.setOnSystemUiVisibilityChangeListener (new View.OnSystemUiVisibilityChangeListener() { decorView.setOnSystemUiVisibilityChangeListener (new View.OnSystemUiVisibilityChangeListener() {
@Override @Override
public void onSystemUiVisibilityChange(int visibility) { public void onSystemUiVisibilityChange(int visibility) {
if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) { if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
decorView.setSystemUiVisibility( decorView.setSystemUiVisibility(
View.SYSTEM_UI_FLAG_LAYOUT_STABLE View.SYSTEM_UI_FLAG_LAYOUT_STABLE
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN); | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
} }
} }
}); });
if (BuildConfig.DEBUG)
Toast.makeText(this, "Launcher process id: " + android.os.Process.myPid(), Toast.LENGTH_LONG).show();
} }
// DEBUG // DEBUG
//new android.support.design.widget.NavigationView(this); //new android.support.design.widget.NavigationView(this);
@ -131,7 +132,7 @@ public class MCLauncherActivity extends AppCompatActivity
} catch(Exception e) { } catch(Exception e) {
//Tools.throwError(this, e); //Tools.throwError(this, e);
e.printStackTrace(); e.printStackTrace();
toast(getStr(R.string.toast_login_error, e.getMessage())); Toast.makeText(this, getStr(R.string.toast_login_error, e.getMessage()), Toast.LENGTH_LONG).show();
finish(); finish();
} }
@ -302,17 +303,6 @@ public class MCLauncherActivity extends AppCompatActivity
return output; return output;
} }
private void toast(final String str) {
runOnUiThread(new Runnable(){
@Override
public void run()
{
Toast.makeText(MCLauncherActivity.this, str, Toast.LENGTH_SHORT).show();
}
});
}
public void mcaccSwitchUser(View view) public void mcaccSwitchUser(View view)
{ {
showProfileInfo(); showProfileInfo();
@ -755,14 +745,6 @@ public class MCLauncherActivity extends AppCompatActivity
{ {
return findViewById(id); return findViewById(id);
} }
private void mkToast(final String str)
{
runOnUiThread(new Runnable() {
public void run() {
Toast.makeText(MCLauncherActivity.this, str, Toast.LENGTH_LONG).show();
}
});
}
public void launcherMenu(View view) public void launcherMenu(View view)
{ {