PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update change scorer dialog to use new label field.

Browse Source 
Bug: 15775300
Change-Id: I61a7d1966742d463508e6801b7845ced8392db84
This commit is contained in:
Jeff Davidson
2014-06-23 18:17:43 -07:00
parent 8b44132467
commit e4d398b32a
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/ActiveNetworkScorerDialog.java
View File

@@ -19,17 +19,15 @@ package com.android.settings;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.NetworkScoreManager; import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppManager; import android.net.NetworkScorerAppManager;
import android.net.NetworkScorerAppManager.NetworkScorerAppData;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController; import com.android.internal.app.AlertController;
import com.android.settings.R;
/** /**
* Dialog to allow a user to select a new network scorer. * Dialog to allow a user to select a new network scorer.
@@ -71,13 +69,14 @@ public final class ActiveNetworkScorerDialog extends AlertActivity implements
} }
private boolean buildDialog() { private boolean buildDialog() {
if (!NetworkScorerAppManager.isPackageValidScorer(this, mNewPackageName)) { NetworkScorerAppData newScorer = NetworkScorerAppManager.getScorer(this, mNewPackageName);
if (newScorer == null) {
Log.e(TAG, "New package " + mNewPackageName + " is not a valid scorer."); Log.e(TAG, "New package " + mNewPackageName + " is not a valid scorer.");
return false; return false;
} }
String oldPackageName = NetworkScorerAppManager.getActiveScorer(this); NetworkScorerAppData oldScorer = NetworkScorerAppManager.getActiveScorer(this);
if (TextUtils.equals(oldPackageName, mNewPackageName)) { if (oldScorer != null && TextUtils.equals(oldScorer.mPackageName, mNewPackageName)) {
Log.i(TAG, "New package " + mNewPackageName + " is already the active scorer."); Log.i(TAG, "New package " + mNewPackageName + " is already the active scorer.");
// Set RESULT_OK to indicate to the caller that the "switch" was successful. // Set RESULT_OK to indicate to the caller that the "switch" was successful.
setResult(RESULT_OK); setResult(RESULT_OK);
@@ -85,24 +84,12 @@ public final class ActiveNetworkScorerDialog extends AlertActivity implements
} }
// Compose dialog. // Compose dialog.
PackageManager pm = getPackageManager(); CharSequence newName = newScorer.mScorerName;
CharSequence oldName = null;
CharSequence newName;
try {
if (oldPackageName != null) {
oldName = pm.getApplicationInfo(oldPackageName, 0).loadLabel(pm);
}
newName = pm.getApplicationInfo(mNewPackageName, 0).loadLabel(pm);
} catch (NameNotFoundException e) {
Log.e(TAG, "Unable to find package info for scorers", e);
return false;
}
final AlertController.AlertParams p = mAlertParams; final AlertController.AlertParams p = mAlertParams;
p.mTitle = getString(R.string.network_scorer_change_active_dialog_title); p.mTitle = getString(R.string.network_scorer_change_active_dialog_title);
if (oldPackageName != null) { if (oldScorer != null) {
p.mMessage = getString(R.string.network_scorer_change_active_dialog_text, newName, p.mMessage = getString(R.string.network_scorer_change_active_dialog_text, newName,
oldName); oldScorer.mScorerName);
} else { } else {
p.mMessage = getString(R.string.network_scorer_change_active_no_previous_dialog_text, p.mMessage = getString(R.string.network_scorer_change_active_no_previous_dialog_text,
newName); newName);