Improved UX when no debuggable apps are available.
In AppPicker, add an extra to exclude the "Nothing" sentinel. This is used when selecting a debug app, and makes sense in that context. However it does not makes sense when choosing an app to modify compatibilty options for, so exclude it. Also update the AppPicker to return a new result code in the case that there are no apps available which match the criteria given. This result code can only be used when the new extra is defined which keep this change low risk. In PlatformCompatDashboard, use the new extra and handle the new result code, showing a dialog to explain that only debuggable apps are shown in user builds. This also results in the "Nothing" item being shown at the top of the app list. Bug: 157633308 Test: Manual Change-Id: Ifb055dd7c030cda42556bca8a9d7e87606f0ff72
This commit is contained in:
@@ -46,10 +46,14 @@ public class AppPicker extends ListActivity {
|
||||
= "com.android.settings.extra.REQUESTIING_PERMISSION";
|
||||
public static final String EXTRA_DEBUGGABLE = "com.android.settings.extra.DEBUGGABLE";
|
||||
public static final String EXTRA_NON_SYSTEM = "com.android.settings.extra.NON_SYSTEM";
|
||||
public static final String EXTRA_INCLUDE_NOTHING = "com.android.settings.extra.INCLUDE_NOTHING";
|
||||
|
||||
public static final int RESULT_NO_MATCHING_APPS = -2;
|
||||
|
||||
private String mPermissionName;
|
||||
private boolean mDebuggableOnly;
|
||||
private boolean mNonSystemOnly;
|
||||
private boolean mIncludeNothing;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle icicle) {
|
||||
@@ -58,9 +62,11 @@ public class AppPicker extends ListActivity {
|
||||
mPermissionName = getIntent().getStringExtra(EXTRA_REQUESTIING_PERMISSION);
|
||||
mDebuggableOnly = getIntent().getBooleanExtra(EXTRA_DEBUGGABLE, false);
|
||||
mNonSystemOnly = getIntent().getBooleanExtra(EXTRA_NON_SYSTEM, false);
|
||||
mIncludeNothing = getIntent().getBooleanExtra(EXTRA_INCLUDE_NOTHING, true);
|
||||
|
||||
mAdapter = new AppListAdapter(this);
|
||||
if (mAdapter.getCount() <= 0) {
|
||||
setResult(RESULT_NO_MATCHING_APPS);
|
||||
finish();
|
||||
} else {
|
||||
setListAdapter(mAdapter);
|
||||
@@ -140,9 +146,11 @@ public class AppPicker extends ListActivity {
|
||||
mPackageInfoList.add(info);
|
||||
}
|
||||
Collections.sort(mPackageInfoList, sDisplayNameComparator);
|
||||
MyApplicationInfo info = new MyApplicationInfo();
|
||||
info.label = context.getText(R.string.no_application);
|
||||
mPackageInfoList.add(0, info);
|
||||
if (mIncludeNothing) {
|
||||
MyApplicationInfo info = new MyApplicationInfo();
|
||||
info.label = context.getText(R.string.no_application);
|
||||
mPackageInfoList.add(0, info);
|
||||
}
|
||||
addAll(mPackageInfoList);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user