mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-13 23:00:45 -04:00
Merge branch 'v3_openjdk' of https://github.com/PojavLauncherTeam/PojavLauncher into v3_openjdk
This commit is contained in:
commit
9a1a2d4aff
@ -88,7 +88,8 @@ public class MCLauncherActivity extends AppCompatActivity
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
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)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user