Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding flags to allow package names to be sent to support." into nyc-dr1-dev

Browse Source
This commit is contained in:
Matthew Fritze
2016-08-25 16:10:22 +00:00
committed by Android (Google) Code Review
parent 5526f9c78c e1398ea4d9
commit 2db15cdf03
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SettingsLib/res/values/config.xml
View File

@@ -22,4 +22,19 @@
<!-- Default data warning level in mb --> <!-- Default data warning level in mb -->
<integer name="default_data_warning_level_mb">2048</integer> <integer name="default_data_warning_level_mb">2048</integer>
<!-- Whether to send a custom package name with the PSD. translatable="false"-->
<bool name="config_sendPackageName">true</bool>
<!-- Name for the set of keys associating package names -->
<string name="config_helpPackageNameKey" translatable="false"></string>
<!-- Name for the set of values of package names -->
<string name="config_helpPackageNameValue" translatable="false"></string>
<!-- Intent key for the package name keys -->
<string name="config_helpIntentExtraKey" translatable="false"></string>
<!-- Intent key for package name values -->
<string name="config_helpIntentNameKey" translatable="false"></string>
</resources> </resources>

22
packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
View File

@@ -23,6 +23,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
import android.content.res.Resources.Theme; import android.content.res.Resources.Theme;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.net.Uri; import android.net.Uri;
@@ -140,7 +141,7 @@ public class HelpUtils {
try { try {
Intent intent = Intent.parseUri(helpUriString, Intent intent = Intent.parseUri(helpUriString,
Intent.URI_ANDROID_APP_SCHEME | Intent.URI_INTENT_SCHEME); Intent.URI_ANDROID_APP_SCHEME | Intent.URI_INTENT_SCHEME);
addIntentParameters(context, intent, backupContext); addIntentParameters(context, intent, backupContext, true /* sendPackageName */);
ComponentName component = intent.resolveActivity(context.getPackageManager()); ComponentName component = intent.resolveActivity(context.getPackageManager());
if (component != null) { if (component != null) {
return intent; return intent;
@@ -164,11 +165,28 @@ public class HelpUtils {
return intent; return intent;
} }
public static void addIntentParameters(Context context, Intent intent, String backupContext) { public static void addIntentParameters(Context context, Intent intent, String backupContext,
boolean sendPackageName) {
if (!intent.hasExtra(EXTRA_CONTEXT)) { if (!intent.hasExtra(EXTRA_CONTEXT)) {
// Insert some context if none exists. // Insert some context if none exists.
intent.putExtra(EXTRA_CONTEXT, backupContext); intent.putExtra(EXTRA_CONTEXT, backupContext);
} }
Resources resources = context.getResources();
boolean includePackageName = resources.getBoolean(R.bool.config_sendPackageName);
if (sendPackageName && includePackageName) {
String[] packageNameKey =
{resources.getString(R.string.config_helpPackageNameKey)};
String[] packageNameValue =
{resources.getString(R.string.config_helpPackageNameValue)};
String intentExtraKey =
resources.getString(R.string.config_helpIntentExtraKey);
String intentNameKey =
resources.getString(R.string.config_helpIntentNameKey);
intent.putExtra(intentExtraKey, packageNameKey);
intent.putExtra(intentNameKey, packageNameValue);
}
intent.putExtra(EXTRA_THEME, 1 /* Light, dark action bar */); intent.putExtra(EXTRA_THEME, 1 /* Light, dark action bar */);
TypedArray array = context.obtainStyledAttributes(new int[]{android.R.attr.colorPrimary}); TypedArray array = context.obtainStyledAttributes(new int[]{android.R.attr.colorPrimary});
intent.putExtra(EXTRA_PRIMARY_COLOR, array.getColor(0, 0)); intent.putExtra(EXTRA_PRIMARY_COLOR, array.getColor(0, 0));