diff options
Diffstat (limited to 'src/com/android/packageinstaller/PackageInstallerActivity.java')
| -rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 9681d2cd..369566f1 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -117,7 +117,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen private static final int DLG_PACKAGE_ERROR = DLG_BASE + 2; private static final int DLG_OUT_OF_SPACE = DLG_BASE + 3; private static final int DLG_INSTALL_ERROR = DLG_BASE + 4; - private static final int DLG_ALLOW_SOURCE = DLG_BASE + 5; private static final int DLG_ADMIN_RESTRICTS_UNKNOWN_SOURCES = DLG_BASE + 6; private static final int DLG_NOT_SUPPORTED_ON_WEAR = DLG_BASE + 7; @@ -165,7 +164,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen getText(R.string.newPerms)), mScrollView); } else { findViewById(R.id.tabscontainer).setVisibility(View.GONE); - findViewById(R.id.divider).setVisibility(View.VISIBLE); + findViewById(R.id.spacer).setVisibility(View.VISIBLE); } if (!supportsRuntimePermissions && N > 0) { permVisible = true; @@ -192,8 +191,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen msg = R.string.install_confirm_question_no_perms; } tabHost.setVisibility(View.GONE); - findViewById(R.id.filler).setVisibility(View.VISIBLE); - findViewById(R.id.divider).setVisibility(View.GONE); mScrollView = null; } if (msg != 0) { @@ -228,7 +225,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen switch (id) { case DLG_UNKNOWN_SOURCES: return new AlertDialog.Builder(this) - .setTitle(R.string.unknown_apps_dlg_title) .setMessage(R.string.unknown_apps_dlg_text) .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -245,7 +241,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen .create(); case DLG_ADMIN_RESTRICTS_UNKNOWN_SOURCES: return new AlertDialog.Builder(this) - .setTitle(R.string.unknown_apps_dlg_title) .setMessage(R.string.unknown_apps_admin_dlg_text) .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -256,7 +251,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen .create(); case DLG_PACKAGE_ERROR : return new AlertDialog.Builder(this) - .setTitle(R.string.Parse_error_dlg_title) .setMessage(R.string.Parse_error_dlg_text) .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -271,7 +265,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen String dlgText = getString(R.string.out_of_space_dlg_text, appTitle.toString()); return new AlertDialog.Builder(this) - .setTitle(R.string.out_of_space_dlg_title) .setMessage(dlgText) .setPositiveButton(R.string.manage_applications, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -296,7 +289,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen String dlgText1 = getString(R.string.install_failed_msg, appTitle1.toString()); return new AlertDialog.Builder(this) - .setTitle(R.string.install_failed) .setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { finish(); @@ -305,31 +297,8 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen .setMessage(dlgText1) .setOnCancelListener(this) .create(); - case DLG_ALLOW_SOURCE: - CharSequence appTitle2 = mPm.getApplicationLabel(mSourceInfo); - String dlgText2 = getString(R.string.allow_source_dlg_text, - appTitle2.toString()); - return new AlertDialog.Builder(this) - .setTitle(R.string.allow_source_dlg_title) - .setMessage(dlgText2) - .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - setResult(RESULT_CANCELED); - finish(); - }}) - .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - SharedPreferences prefs = getSharedPreferences(PREFS_ALLOWED_SOURCES, - Context.MODE_PRIVATE); - prefs.edit().putBoolean(mSourceInfo.packageName, true).apply(); - startInstallConfirm(); - } - }) - .setOnCancelListener(this) - .create(); case DLG_NOT_SUPPORTED_ON_WEAR: return new AlertDialog.Builder(this) - .setTitle(R.string.wear_not_allowed_dlg_title) .setMessage(R.string.wear_not_allowed_dlg_text) .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { |