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

Add indicator for system dialer in Settings

Browse Source 
Bug: 26748630
Change-Id: I60b9f2783fb4c1f49c79449dd150132c73a9fb2a
This commit is contained in:
Hall Liu
2016-03-15 16:30:43 -07:00
parent b740f34f72
commit cbde0b8afd
4 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/AppListPreference.java
View File

@@ -56,6 +56,7 @@ public class AppListPreference extends CustomListPreference {
private Drawable[] mEntryDrawables;
private boolean mShowItemNone = false;
private CharSequence[] mSummaries;
private int mSystemAppIndex = -1;
public class AppArrayAdapter extends ArrayAdapter<CharSequence> {
private Drawable[] mImageDrawables = null;
@@ -79,8 +80,12 @@ public class AppListPreference extends CustomListPreference {
View view = inflater.inflate(R.layout.app_preference_item, parent, false);
TextView textView = (TextView) view.findViewById(android.R.id.title);
textView.setText(getItem(position));
if (position == mSelectedIndex) {
if (position == mSelectedIndex && position == mSystemAppIndex) {
view.findViewById(R.id.system_default_label).setVisibility(View.VISIBLE);
} else if (position == mSelectedIndex) {
view.findViewById(R.id.default_label).setVisibility(View.VISIBLE);
} else if (position == mSystemAppIndex) {
view.findViewById(R.id.system_label).setVisibility(View.VISIBLE);
}
ImageView imageView = (ImageView) view.findViewById(android.R.id.icon);
imageView.setImageDrawable(mImageDrawables[position]);
@@ -122,6 +127,11 @@ public class AppListPreference extends CustomListPreference {
}
public void setPackageNames(CharSequence[] packageNames, CharSequence defaultPackageName) {
setPackageNames(packageNames, defaultPackageName, null);
}
public void setPackageNames(CharSequence[] packageNames, CharSequence defaultPackageName,
CharSequence systemPackageName) {
// Look up all package names in PackageManager. Skip ones we can't find.
PackageManager pm = getContext().getPackageManager();
final int entryCount = packageNames.length + (mShowItemNone ? 1 : 0);
@@ -129,6 +139,7 @@ public class AppListPreference extends CustomListPreference {
List<CharSequence> validatedPackageNames = new ArrayList<>(entryCount);
List<Drawable> entryDrawables = new ArrayList<>(entryCount);
int selectedIndex = -1;
mSystemAppIndex = -1;
for (int i = 0; i < packageNames.length; i++) {
try {
ApplicationInfo appInfo = pm.getApplicationInfoAsUser(packageNames[i].toString(), 0,
@@ -140,6 +151,10 @@ public class AppListPreference extends CustomListPreference {
appInfo.packageName.contentEquals(defaultPackageName)) {
selectedIndex = i;
}
if (appInfo.packageName != null && systemPackageName != null &&
appInfo.packageName.contentEquals(systemPackageName)) {
mSystemAppIndex = i;
}
} catch (NameNotFoundException e) {
// Skip unknown packages.
}

8
src/com/android/settings/applications/DefaultPhonePreference.java
View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.telecom.DefaultDialerManager;
import android.telecom.TelecomManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.AttributeSet;
@@ -56,13 +57,18 @@ public class DefaultPhonePreference extends AppListPreference implements SelfAva
for (int i = 0; i < dialerPackages.size(); i++) {
dialers[i] = dialerPackages.get(i);
}
setPackageNames(dialers, getDefaultPackage());
setPackageNames(dialers, getDefaultPackage(), getSystemPackage());
}
private String getDefaultPackage() {
return DefaultDialerManager.getDefaultDialerApplication(getContext(), mUserId);
}
private String getSystemPackage() {
TelecomManager tm = TelecomManager.from(getContext());
return tm.getSystemDialerPackage();
}
@Override
public boolean isAvailable(Context context) {
final TelephonyManager tm =