This commit is contained in:
jens 2022-01-08 19:00:06 +01:00
parent 230521149f
commit 890260b8eb
2 changed files with 44 additions and 8 deletions

View File

@ -230,7 +230,7 @@ public class ActivityManageActionStartActivity extends Activity
return null; return null;
} }
private AlertDialog getActionStartActivityDialog1() private AlertDialog getActionStartActivityDialog1Application()
{ {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this); AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
alertDialogBuilder.setTitle(getResources().getString(R.string.selectApplication)); alertDialogBuilder.setTitle(getResources().getString(R.string.selectApplication));
@ -260,8 +260,7 @@ public class ActivityManageActionStartActivity extends Activity
@Override @Override
public void onClick(DialogInterface dialog, int which) public void onClick(DialogInterface dialog, int which)
{ {
getActionStartActivityDialog3(packageArray[which]).show(); getActionStartActivityDialog4ActivityPickMethod(packageArray[which]).show();
Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.chooseActivityHint), ActivityManageActionStartActivity.this).show();
} }
}); });
AlertDialog alertDialog = alertDialogBuilder.create(); AlertDialog alertDialog = alertDialogBuilder.create();
@ -269,12 +268,47 @@ public class ActivityManageActionStartActivity extends Activity
} }
else else
{ {
getActionStartActivityDialog3(packageArray[0]).show(); getActionStartActivityDialog4ActivityPickMethod(packageArray[0]).show();
Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.chooseActivityHint), ActivityManageActionStartActivity.this).show();
} }
} }
private AlertDialog getActionStartActivityDialog3(final String packageName) private AlertDialog getActionStartActivityDialog4ActivityPickMethod(final String packageName)
{
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
alertDialogBuilder.setMessage(getResources().getString(R.string.launcherOrManualExplanation));
// alertDialogBuilder.setTitle(getResources().getString(R.string.co));
alertDialogBuilder.setPositiveButton(getResources().getString(R.string.takeLauncherActivity), new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
// Pick the launcher automatically
Intent launchIntent = getPackageManager().getLaunchIntentForPackage(packageName);
if (launchIntent != null)
{
ActivityInfo ai = ActivityManageActionStartActivity.getActivityInfoForPackageNameAndActivityName(packageName, launchIntent.getComponent().getClassName());
etPackageName.setText(ai.packageName);
etActivityOrActionPath.setText(ai.name);
}
}
});
alertDialogBuilder.setNegativeButton(getResources().getString(R.string.pickActivityManually), new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
getActionStartActivityDialog5Activity(packageName).show();
Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.chooseActivityHint), ActivityManageActionStartActivity.this).show();
}
});
final String activityArray[] = ActivityManageActionStartActivity.getActivityListForPackageName(packageName);
AlertDialog alertDialog = alertDialogBuilder.create();
return alertDialog;
}
private AlertDialog getActionStartActivityDialog5Activity(final String packageName)
{ {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this); AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
alertDialogBuilder.setTitle(getResources().getString(R.string.selectActivityToBeStarted)); alertDialogBuilder.setTitle(getResources().getString(R.string.selectActivityToBeStarted));
@ -290,7 +324,6 @@ public class ActivityManageActionStartActivity extends Activity
} }
}); });
AlertDialog alertDialog = alertDialogBuilder.create(); AlertDialog alertDialog = alertDialogBuilder.create();
return alertDialog; return alertDialog;
} }
@ -621,7 +654,7 @@ public class ActivityManageActionStartActivity extends Activity
protected void onPostExecute(Void result) protected void onPostExecute(Void result)
{ {
progressDialog.dismiss(); progressDialog.dismiss();
getActionStartActivityDialog1().show(); getActionStartActivityDialog1Application().show();
} }
} }
} }

View File

@ -751,4 +751,7 @@
<string name="message">message</string> <string name="message">message</string>
<string name="onDays">on days</string> <string name="onDays">on days</string>
<string name="notSet">not set</string> <string name="notSet">not set</string>
<string name="takeLauncherActivity">Find launcher automatically</string>
<string name="pickActivityManually">Choose activity manually</string>
<string name="launcherOrManualExplanation">Easy mode: Automation can try to identify the launcher activity of the desired program.\nAlternatively you can also pick one of the application\'s activities manually.\nWhat would you like?</string>
</resources> </resources>