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

Merge "Add user selectable Default Browser feature - part 3" into mnc-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2015-04-29 21:16:17 +00:00
committed by Android (Google) Code Review
parent 2add7d0d05 d5f379304c
commit b880f1424b
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/android/settings/applications/ManageDefaultApps.java
View File

@@ -21,6 +21,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
@@ -66,15 +67,25 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
myUserId = UserHandle.myUserId(); myUserId = UserHandle.myUserId();
mDefaultBrowserPreference = (DefaultBrowserPreference) findPreference(KEY_DEFAULT_BROWSER); mDefaultBrowserPreference = (DefaultBrowserPreference) findPreference(KEY_DEFAULT_BROWSER);
mDefaultBrowserPreference.setOnPreferenceClickListener( mDefaultBrowserPreference.setOnPreferenceChangeListener(
new Preference.OnPreferenceClickListener() { new Preference.OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceChange(Preference preference, Object newValue) {
final CharSequence packageName = mDefaultBrowserPreference.getValue(); if (newValue == null) {
return false;
}
final CharSequence packageName = (CharSequence) newValue;
if (TextUtils.isEmpty(packageName)) { if (TextUtils.isEmpty(packageName)) {
return false; return false;
} }
return mPm.setDefaultBrowserPackageName(packageName.toString(), myUserId); boolean result = mPm.setDefaultBrowserPackageName(
packageName.toString(), myUserId);
if (result) {
mDefaultBrowserPreference.setValue(packageName.toString());
final CharSequence appName = mDefaultBrowserPreference.getEntry();
mDefaultBrowserPreference.setSummary(appName);
}
return result;
} }
}); });
final boolean isRestrictedUser = UserManager.get(getActivity()) final boolean isRestrictedUser = UserManager.get(getActivity())
@@ -104,18 +115,30 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
String packageName = getPackageManager().getDefaultBrowserPackageName( final PackageManager pm = getPackageManager();
UserHandle.myUserId());
String packageName = pm.getDefaultBrowserPackageName(UserHandle.myUserId());
if (!TextUtils.isEmpty(packageName)) { if (!TextUtils.isEmpty(packageName)) {
// Check if the package is still there // Check if the default Browser package is still there
Intent intent = new Intent(); Intent intent = new Intent();
intent.setPackage(packageName); intent.setPackage(packageName);
intent.setAction(Intent.ACTION_VIEW);
intent.addCategory(Intent.CATEGORY_BROWSABLE);
intent.setData(Uri.parse("http:"));
ResolveInfo info = mPm.resolveActivityAsUser(intent, 0, myUserId); ResolveInfo info = mPm.resolveActivityAsUser(intent, 0, myUserId);
if (info != null) { if (info != null) {
mDefaultBrowserPreference.setValue(packageName); mDefaultBrowserPreference.setValue(packageName);
CharSequence label = info.loadLabel(pm);
mDefaultBrowserPreference.setSummary(label);
} else { } else {
// Otherwise select the first one CharSequence[] values = mDefaultBrowserPreference.getEntryValues();
mDefaultBrowserPreference.setValueIndex(0); if (values.length > 0) {
// Otherwise select the first one if we can
mDefaultBrowserPreference.setValueIndex(0);
} else {
// Do nothing, we cannot select any value
}
} }
} else { } else {
Log.d(TAG, "Cannot set empty default Browser value!"); Log.d(TAG, "Cannot set empty default Browser value!");